diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 8ecc357f3f..5c6476bdd9 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -8,196 +8,6 @@
* @subpackage Administration
*/
-// Ugly recursive category stuff.
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $categories
- * @param unknown_type $page
- * @param unknown_type $per_page
- */
-function cat_rows( $parent = 0, $level = 0, $categories = 0, $page = 1, $per_page = 20, $taxonomy = 'category' ) {
-
- $count = 0;
-
- if ( empty($categories) ) {
-
- $args = array('hide_empty' => 0, 'taxonomy' => $taxonomy);
- if ( !empty($_GET['s']) )
- $args['search'] = $_GET['s'];
-
- $categories = get_categories( $args );
-
- if ( empty($categories) )
- return false;
- }
-
- $children = _get_term_hierarchy($taxonomy);
-
- echo _cat_rows( $parent, $level, $categories, $children, $page, $per_page, $count );
-
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $categories
- * @param unknown_type $count
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $page
- * @param unknown_type $per_page
- * @return string the output of the table.
- */
-function _cat_rows( $parent = 0, $level = 0, $categories, &$children, $page = 1, $per_page = 20, &$count ) {
-
- $start = ($page - 1) * $per_page;
- $end = $start + $per_page;
-
- $output = '';
- foreach ( $categories as $key => $category ) {
- if ( $count >= $end )
- break;
-
- if ( $category->parent != $parent && empty($_GET['s']) )
- continue;
-
- // If the page starts in a subtree, print the parents.
- if ( $count == $start && $category->parent > 0 ) {
-
- $my_parents = array();
- $p = $category->parent;
- while ( $p ) {
- $my_parent = get_category( $p );
- $my_parents[] = $my_parent;
- if ( $my_parent->parent == 0 )
- break;
- $p = $my_parent->parent;
- }
-
- $num_parents = count($my_parents);
- while( $my_parent = array_pop($my_parents) ) {
- $output = "\t" . _cat_row( $my_parent, $level - $num_parents );
- $num_parents--;
- }
- }
-
- if ( $count >= $start )
- $output .= "\t" . _cat_row( $category, $level );
-
- unset( $categories[ $key ] );
-
- $count++;
-
- if ( isset($children[$category->term_id]) )
- $output .= _cat_rows( $category->term_id, $level + 1, $categories, $children, $page, $per_page, $count );
- }
-
- return $output;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $category
- * @param unknown_type $level
- * @param unknown_type $name_override
- * @return unknown
- */
-function _cat_row( $category, $level, $name_override = false ) {
- static $row_class = '';
-
- $category = get_category( $category, OBJECT, 'display' );
-
- $default_cat_id = (int) get_option( 'default_category' );
- $pad = str_repeat( '— ', max(0, $level) );
- $name = ( $name_override ? $name_override : $pad . ' ' . $category->name );
- $edit_link = "categories.php?action=edit&cat_ID=$category->term_id";
- if ( current_user_can( 'manage_categories' ) ) {
- $edit = "name)) . "'>" . esc_attr( $name ) . '
';
- $actions = array();
- $actions['edit'] = '' . __('Edit') . '';
- $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . '';
- if ( $default_cat_id != $category->term_id )
- $actions['delete'] = "term_id) . "'>" . __('Delete') . "";
- $actions = apply_filters('cat_row_actions', $actions, $category);
- $action_count = count($actions);
- $i = 0;
- $edit .= '';
- foreach ( $actions as $action => $link ) {
- ++$i;
- ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
- $edit .= "$link$sep";
- }
- $edit .= '
';
- } else {
- $edit = $name;
- }
-
- $row_class = 'alternate' == $row_class ? '' : 'alternate';
- $qe_data = get_category_to_edit($category->term_id);
-
- $category->count = number_format_i18n( $category->count );
- $posts_count = ( $category->count > 0 ) ? "$category->count" : $category->count;
- $output = "";
-
- $columns = get_column_headers('categories');
- $hidden = get_hidden_columns('categories');
- foreach ( $columns as $column_name => $column_display_name ) {
- $class = "class=\"$column_name column-$column_name\"";
-
- $style = '';
- if ( in_array($column_name, $hidden) )
- $style = ' style="display:none;"';
-
- $attributes = "$class$style";
-
- switch ($column_name) {
- case 'cb':
- $output .= "| ";
- if ( $default_cat_id != $category->term_id ) {
- $output .= "";
- } else {
- $output .= " ";
- }
- $output .= ' | ';
- break;
- case 'name':
- $output .= "$edit";
- $output .= '';
- $output .= ' ' . $qe_data->name . ' ';
- $output .= ' ' . apply_filters('editable_slug', $qe_data->slug) . ' ';
- $output .= ' ' . $qe_data->parent . ' | ';
- break;
- case 'description':
- $output .= "$category->description | ";
- break;
- case 'slug':
- $output .= "" . apply_filters('editable_slug', $category->slug) . " | ";
- break;
- case 'posts':
- $attributes = 'class="posts column-posts num"' . $style;
- $output .= "$posts_count | \n";
- break;
- default:
- $output .= "";
- $output .= apply_filters('manage_categories_custom_column', '', $column_name, $category->term_id);
- $output .= " | ";
- }
- }
- $output .= '
';
-
- return $output;
-}
-
/**
* {@internal Missing Short Description}}
*
@@ -2708,7 +2518,7 @@ function meta_form() {
?>
-
+
@@ -3385,7 +3195,7 @@ function find_posts_div($found_action = '') {
-
+
@@ -3395,7 +3205,7 @@ function find_posts_div($found_action = '') {
-
+