Ticket #8146: catfiltering.diff

opt/www/eclipsework/WPDev/wp-admin/edit-link-categories.php

@@ -141 +141 @@
 if ( $categories ) {
         $output = '';
         foreach ( $categories as $category ) {
-                $category = sanitize_term($category, 'link_category', 'display');
                 $output .= link_cat_row($category);
         }
-        $output = apply_filters('cat_rows', $output);
         echo $output;
         unset($category);
 }

opt/www/eclipsework/WPDev/wp-admin/includes/template.php

@@ -95 +95 @@
         $output = ob_get_contents();
         ob_end_clean();
 
-        $output = apply_filters('cat_rows', $output);
-
         echo $output;
 }
 
@@ -114 +112 @@
         global $class;
 
         $category = get_category( $category );
+        $catname = sanitize_term_field( 'name', $category->name, $category->term_id, 'category', 'display' );
+        $catdesc = sanitize_term_field( 'description', $category->description, $category->term_id, 'category', 'display' );
 
         $default_cat_id = (int) get_option( 'default_category' );
         $pad = str_repeat( '— ', $level );
-        $name = ( $name_override ? $name_override : $pad . ' ' . $category->name );
+        $name = ( $name_override ? $name_override : $pad . ' ' . $catname );
         $edit_link = "categories.php?action=edit&cat_ID=$category->term_id";
         if ( current_user_can( 'manage_categories' ) ) {
-                $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>" . attribute_escape( $name ) . '</a><br />';
+                $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $catname)) . "'>" . attribute_escape( $name ) . '</a><br />';
                 $actions = array();
                 $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
                 $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
@@ -173 +173 @@
                                 $output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>';
                                 break;
                         case 'description':
-                                $output .= "<td $attributes>$category->description</td>";
+                                $output .= "<td $attributes>$catdesc</td>";
                                 break;
                         case 'slug':
                                 $output .= "<td $attributes>$category->slug</td>";
@@ -278 +278 @@
         if ( is_wp_error( $category ) )
                 return $category;
 
+
+        $catname = sanitize_term_field( 'name', $category->name, $category->term_id, 'link_category', 'display' );
+        $catdesc = sanitize_term_field( 'description', $category->description, $category->term_id, 'link_category', 'display' );
+
         $default_cat_id = (int) get_option( 'default_link_category' );
-        $name = ( $name_override ? $name_override : $category->name );
+        $name = ( $name_override ? $name_override : $catname );
         $edit_link = "link-category.php?action=edit&amp;cat_ID=$category->term_id";
         if ( current_user_can( 'manage_categories' ) ) {
-                $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>$name</a><br />";
+                $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $catname)) . "'>$name</a><br />";
                 $actions = array();
                 $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
                 $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
@@ -334 +338 @@
                                 $output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>';
                                 break;
                         case 'description':
-                                $output .= "<td $attributes>$category->description</td>";
+                                $output .= "<td $attributes>$catdesc</td>";
                                 break;
                         case 'links':
                                 $attributes = 'class="links column-links num"' . $style;
@@ -343 +347 @@
         }
         $output .= '</tr>';
 
-        return apply_filters( 'link_cat_row', $output );
+        return $output;
 }
 
 /**
@@ -665 +669 @@
                 $out .= _tag_row( $tag, ++$count % 2 ? ' class="iedit alternate"' : ' class="iedit"' );
 
         // filter and send to screen
-        $out = apply_filters('tag_rows', $out);
         echo $out;
         return $count;
 }