WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cat row filtering cleanup from jhodgdon. see #8146 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-11-18 17:25:43 +00:00
parent 00ced576ac
commit 9f7c101e5c
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/edit-link-categories.php
View File

@ -143,7 +143,6 @@ if ( $categories ) {
foreach ( $categories as $category ) { foreach ( $categories as $category ) {
$output .= link_cat_row($category); $output .= link_cat_row($category);
} }
$output = apply_filters('cat_rows', $output);
echo $output; echo $output;
unset($category); unset($category);
} }

63
wp-admin/includes/template.php
View File

@ -95,8 +95,6 @@ function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $p
$output = ob_get_contents(); $output = ob_get_contents();
ob_end_clean(); ob_end_clean();
$output = apply_filters('cat_rows', $output);
echo $output; echo $output;
} }
@ -113,17 +111,14 @@ function _cat_rows( $categories, &$count, $parent = 0, $level = 0, $page = 1, $p
function _cat_row( $category, $level, $name_override = false ) { function _cat_row( $category, $level, $name_override = false ) {
static $row_class; static $row_class;
$category = get_category( $category ); $category = get_category( $category, OBJECT, 'display' );
$catname = sanitize_term_field( 'name', $category->name, $category->term_id, 'category', 'display' );
$catdesc = sanitize_term_field( 'description', $category->description, $category->term_id, 'category', 'display' );
$qe_name = sanitize_term_field( 'name', $category->name, $category->term_id, 'category', 'edit' );
$default_cat_id = (int) get_option( 'default_category' ); $default_cat_id = (int) get_option( 'default_category' );
$pad = str_repeat( '— ', $level ); $pad = str_repeat( '— ', $level );
$name = ( $name_override ? $name_override : $pad . ' ' . $catname ); $name = ( $name_override ? $name_override : $pad . ' ' . $category->name );
$edit_link = "categories.php?action=edit&cat_ID=$category->term_id"; $edit_link = "categories.php?action=edit&cat_ID=$category->term_id";
if ( current_user_can( 'manage_categories' ) ) { if ( current_user_can( 'manage_categories' ) ) {
$edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $catname)) . "'>" . attribute_escape( $name ) . '</a><br />'; $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>" . attribute_escape( $name ) . '</a><br />';
$actions = array(); $actions = array();
$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
@ -141,6 +136,8 @@ function _cat_row( $category, $level, $name_override = false ) {
} }
$row_class = 'alternate' == $row_class ? '' : 'alternate'; $row_class = 'alternate' == $row_class ? '' : 'alternate';
$qe_data = get_category_to_edit($category->term_id);
$category->count = number_format_i18n( $category->count ); $category->count = number_format_i18n( $category->count );
$posts_count = ( $category->count > 0 ) ? "<a href='edit.php?cat=$category->term_id'>$category->count</a>" : $category->count; $posts_count = ( $category->count > 0 ) ? "<a href='edit.php?cat=$category->term_id'>$category->count</a>" : $category->count;
$output = "<tr id='cat-$category->term_id' class='iedit $row_class'>"; $output = "<tr id='cat-$category->term_id' class='iedit $row_class'>";
@ -168,13 +165,13 @@ function _cat_row( $category, $level, $name_override = false ) {
break; break;
case 'name': case 'name':
$output .= "<td $attributes>$edit"; $output .= "<td $attributes>$edit";
$output .= '<div class="hidden" id="inline_' . $category->term_id . '">'; $output .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
$output .= '<div class="name">' . $qe_name . '</div>'; $output .= '<div class="name">' . $qe_data->name . '</div>';
$output .= '<div class="slug">' . $category->slug . '</div>'; $output .= '<div class="slug">' . $qe_data->slug . '</div>';
$output .= '<div class="cat_parent">' . $category->parent . '</div></div></td>'; $output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>';
break; break;
case 'description': case 'description':
$output .= "<td $attributes>$catdesc</td>"; $output .= "<td $attributes>$category->description</td>";
break; break;
case 'slug': case 'slug':
$output .= "<td $attributes>$category->slug</td>"; $output .= "<td $attributes>$category->slug</td>";
@ -186,7 +183,7 @@ function _cat_row( $category, $level, $name_override = false ) {
} }
$output .= '</tr>'; $output .= '</tr>';
return apply_filters('cat_row', $output); return $output;
} }
/** /**
@ -274,20 +271,16 @@ function inline_edit_term_row($type) {
function link_cat_row( $category, $name_override = false ) { function link_cat_row( $category, $name_override = false ) {
global $class; global $class;
if ( !$category = get_term( $category, 'link_category' ) ) if ( !$category = get_term( $category, 'link_category', OBJECT, 'display' ) )
return false; return false;
if ( is_wp_error( $category ) ) if ( is_wp_error( $category ) )
return $category; return $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' );
$qe_name = sanitize_term_field( 'name', $category->name, $category->term_id, 'category', 'edit' );
$default_cat_id = (int) get_option( 'default_link_category' ); $default_cat_id = (int) get_option( 'default_link_category' );
$name = ( $name_override ? $name_override : $catname ); $name = ( $name_override ? $name_override : $category->name );
$edit_link = "link-category.php?action=edit&amp;cat_ID=$category->term_id"; $edit_link = "link-category.php?action=edit&amp;cat_ID=$category->term_id";
if ( current_user_can( 'manage_categories' ) ) { if ( current_user_can( 'manage_categories' ) ) {
$edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $catname)) . "'>$name</a><br />"; $edit = "<a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $category->name)) . "'>$name</a><br />";
$actions = array(); $actions = array();
$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
@ -305,6 +298,8 @@ function link_cat_row( $category, $name_override = false ) {
} }
$class = 'alternate' == $class ? '' : 'alternate'; $class = 'alternate' == $class ? '' : 'alternate';
$qe_data = get_term_to_edit($category->term_id, 'link_category');
$category->count = number_format_i18n( $category->count ); $category->count = number_format_i18n( $category->count );
$count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count; $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
$output = "<tr id='link-cat-$category->term_id' class='iedit $class'>"; $output = "<tr id='link-cat-$category->term_id' class='iedit $class'>";
@ -331,13 +326,13 @@ function link_cat_row( $category, $name_override = false ) {
break; break;
case 'name': case 'name':
$output .= "<td $attributes>$edit"; $output .= "<td $attributes>$edit";
$output .= '<div class="hidden" id="inline_' . $category->term_id . '">'; $output .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
$output .= '<div class="name">' . $qe_name . '</div>'; $output .= '<div class="name">' . $qe_data->name . '</div>';
$output .= '<div class="slug">' . $category->slug . '</div>'; $output .= '<div class="slug">' . $qe_data->slug . '</div>';
$output .= '<div class="cat_parent">' . $category->parent . '</div></div></td>'; $output .= '<div class="cat_parent">' . $qe_data->parent . '</div></div></td>';
break; break;
case 'description': case 'description':
$output .= "<td $attributes>$catdesc</td>"; $output .= "<td $attributes>$category->description</td>";
break; break;
case 'links': case 'links':
$attributes = 'class="links column-links num"' . $style; $attributes = 'class="links column-links num"' . $style;
@ -346,7 +341,7 @@ function link_cat_row( $category, $name_override = false ) {
} }
$output .= '</tr>'; $output .= '</tr>';
return apply_filters( 'link_cat_row', $output ); return $output;
} }
/** /**
@ -579,12 +574,11 @@ function wp_link_category_checklist( $link_id = 0 ) {
* @return unknown * @return unknown
*/ */
function _tag_row( $tag, $class = '' ) { function _tag_row( $tag, $class = '' ) {
$count = number_format_i18n( $tag->count ); $count = number_format_i18n( $tag->count );
$count = ( $count > 0 ) ? "<a href='edit.php?tag=$tag->slug'>$count</a>" : $count; $count = ( $count > 0 ) ? "<a href='edit.php?tag=$tag->slug'>$count</a>" : $count;
$tagname = sanitize_term_field( 'name', $tag->name, $tag->term_id, 'tag', 'display' );
$qe_name = sanitize_term_field( 'name', $tag->name, $tag->term_id, 'tag', 'edit' );
$name = apply_filters( 'term_name', $tag->name );
$qe_data = get_term($tag->term_id, 'post_tag', object, 'edit');
$edit_link = "edit-tags.php?action=edit&amp;tag_ID=$tag->term_id"; $edit_link = "edit-tags.php?action=edit&amp;tag_ID=$tag->term_id";
$out = ''; $out = '';
$out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>'; $out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>';
@ -604,7 +598,7 @@ function _tag_row( $tag, $class = '' ) {
$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>'; $out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
break; break;
case 'name': case 'name':
$out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . attribute_escape(sprintf(__('Edit "%s"'), $tagname)) . '">' . $tagname . '</a></strong><br />'; $out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . attribute_escape(sprintf(__('Edit "%s"'), $name)) . '">' . $name . '</a></strong><br />';
$actions = array(); $actions = array();
$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>'; $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
@ -616,9 +610,9 @@ function _tag_row( $tag, $class = '' ) {
( $i == $action_count ) ? $sep = '' : $sep = ' | '; ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
$out .= "<span class='$action'>$link$sep</span>"; $out .= "<span class='$action'>$link$sep</span>";
} }
$out .= '<div class="hidden" id="inline_' . $tag->term_id . '">'; $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
$out .= '<div class="name">' . $qe_name . '</div>'; $out .= '<div class="name">' . $qe_data->name . '</div>';
$out .= '<div class="slug">' . $tag->slug . '</div></div></td>'; $out .= '<div class="slug">' . $qe_data->slug . '</div></div></td>';
break; break;
case 'slug': case 'slug':
$out .= "<td $attributes>$tag->slug</td>"; $out .= "<td $attributes>$tag->slug</td>";
@ -668,7 +662,6 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '' ) {
$out .= _tag_row( $tag, ++$count % 2 ? ' class="iedit alternate"' : ' class="iedit"' ); $out .= _tag_row( $tag, ++$count % 2 ? ' class="iedit alternate"' : ' class="iedit"' );
// filter and send to screen // filter and send to screen
$out = apply_filters('tag_rows', $out);
echo $out; echo $out;
return $count; return $count;
} }