diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-25 12:01:00 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-25 12:01:00 +0000 |
commit | 65fdf82523ea65f8df0ff66d84ef1125f99a440d (patch) | |
tree | 44e9fa798b6e16682b0610345ec1d90397cc7fe8 /wp-admin/admin-functions.php | |
parent | 29d92778637bec6d154cb4557f52a458d0c265ad (diff) | |
download | wordpress-mu-65fdf82523ea65f8df0ff66d84ef1125f99a440d.tar.gz wordpress-mu-65fdf82523ea65f8df0ff66d84ef1125f99a440d.tar.xz wordpress-mu-65fdf82523ea65f8df0ff66d84ef1125f99a440d.zip |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@707 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
-rw-r--r-- | wp-admin/admin-functions.php | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 8fa5184..9ab92cb 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -700,31 +700,7 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) { continue; } if ($category->category_parent == $parent) { - $category->cat_name = wp_specialchars($category->cat_name,'double'); - $pad = str_repeat('— ', $level); - if ( current_user_can('manage_categories') ) { - $edit = "<a href='categories.php?action=edit&cat_ID=$category->cat_ID' class='edit'>".__('Edit')."</a></td>"; - $default_cat_id = get_option('default_category'); - $default_link_cat_id = get_option('default_link_category'); - - if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) ) - $edit .= "<td><a href='" . wp_nonce_url("categories.php?action=delete&cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" to stop."), js_escape($category->cat_name), js_escape(get_catname($default_cat_id)), js_escape(get_catname($default_link_cat_id))) . "' );\" class='delete'>".__('Delete')."</a>"; - else - $edit .= "<td style='text-align:center'>".__("Default"); - } - else - $edit = ''; - - $class = ('alternate' == $class) ? '' : 'alternate'; - - $category->category_count = number_format( $category->category_count ); - $category->link_count = number_format( $category->link_count ); - echo "<tr id='cat-$category->cat_ID' class='$class'><th scope='row'>$category->cat_ID</th><td>$pad $category->cat_name</td> - <td>$category->category_description</td> - <td align='center'>$category->category_count</td> - <td align='center'>$category->link_count</td> - <td>$edit</td> - </tr>"; + echo "\t" . _cat_row( $category, $level ); cat_rows($category->cat_ID, $level +1, $categories); } } @@ -733,6 +709,35 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) { } } +function _cat_row( $category, $level, $name_override = false ) { + global $class; + + $pad = str_repeat('— ', $level); + if ( current_user_can('manage_categories') ) { + $edit = "<a href='categories.php?action=edit&cat_ID=$category->cat_ID' class='edit'>".__('Edit')."</a></td>"; + $default_cat_id = get_option('default_category'); + $default_link_cat_id = get_option('default_link_category'); + + if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) ) + $edit .= "<td><a href='" . wp_nonce_url("categories.php?action=delete&cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" to stop."), js_escape($category->cat_name), js_escape(get_catname($default_cat_id)), js_escape(get_catname($default_link_cat_id))) . "' );\" class='delete'>".__('Delete')."</a>"; + else + $edit .= "<td style='text-align:center'>".__("Default"); + } else + $edit = ''; + + $class = ( ( defined('DOING_AJAX') && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'"; + + $category->category_count = number_format( $category->category_count ); + $category->link_count = number_format( $category->link_count ); + return "<tr id='cat-$category->cat_ID'$class> + <th scope='row'>$category->cat_ID</th> + <td>" . ( $name_override ? $name_override : $pad . ' ' . $category->cat_name ) . "</td> + <td>$category->category_description</td> + <td align='center'>$category->category_count</td> + <td align='center'>$category->link_count</td> + <td>$edit</td>\n\t</tr>\n"; +} + function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) { global $wpdb, $class, $post; |