<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13081] trunk/wp-admin: Fix Terms Per Page for taxonomies,
Apply old Category filter to value.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13081">13081</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-13 03:52:33 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Terms Per Page for taxonomies, Apply old Category filter to value. See <a href="http://trac.wordpress.org/ticket/11838">#11838</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (13080 => 13081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-02-13 03:33:33 UTC (rev 13080)
+++ trunk/wp-admin/edit-tags.php 2010-02-13 03:52:33 UTC (rev 13081)
</span><span class="lines">@@ -196,12 +196,25 @@
</span><span class="cx"> if ( empty($pagenum) )
</span><span class="cx"> $pagenum = 1;
</span><span class="cx">
</span><del>-$tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
</del><ins>+if ( 'post_tag' == $taxonomy )
+ $tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
+elseif ( 'category' == $taxonomy )
+ $tags_per_page = (int) get_user_option( 'categories_per_page' );
+else
+ $tags_per_page = (int) get_user_option( 'edit_' . $taxonomy . '_per_page' );
+
</ins><span class="cx"> if ( empty($tags_per_page) || $tags_per_page < 1 )
</span><span class="cx"> $tags_per_page = 20;
</span><del>-$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
-$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
</del><span class="cx">
</span><ins>+if ( 'post_tag' == $taxonomy ) {
+ $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+ $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
+} elseif ( 'category' == $taxonomy ) {
+ $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
+} else {
+ $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
+}
+
</ins><span class="cx"> if ( !empty($_GET['s']) ) {
</span><span class="cx"> $searchterms = trim(stripslashes($_GET['s']));
</span><span class="cx"> $total_terms = count( get_terms( $taxonomy, array( 'search' => $searchterms, 'number' => 0, 'hide_empty' => 0 ) ) );
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13080 => 13081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-13 03:33:33 UTC (rev 13080)
+++ trunk/wp-admin/includes/template.php 2010-02-13 03:52:33 UTC (rev 13081)
</span><span class="lines">@@ -3638,11 +3638,14 @@
</span><span class="cx"> case 'upload':
</span><span class="cx"> $per_page_label = __('Media items per page:');
</span><span class="cx"> break;
</span><del>- case 'categories':
- $per_page_label = __('Categories per page:');
- break;
</del><span class="cx"> case 'edit-tags':
</span><del>- $per_page_label = __('Tags per page:');
</del><ins>+ global $taxonomy, $tax;
+ if ( 'post_tag' == $taxonomy )
+ $per_page_label = __('Tags per page:');
+ elseif ( 'category' == $taxonomy )
+ $per_page_label = __('Categories per page:');
+ else
+ $per_page_label = sprintf(_x('%s per page:', '%s: plural taxonomy name'), $tax->label);
</ins><span class="cx"> break;
</span><span class="cx"> case 'plugins':
</span><span class="cx"> $per_page_label = __('Plugins per page:');
</span><span class="lines">@@ -3652,6 +3655,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $option = str_replace( '-', '_', "{$screen->id}_per_page" );
</span><ins>+ if ( 'edit_tags_per_page' == $option ) {
+ if ( 'category' == $taxonomy )
+ $option = 'categories_per_page';
+ elseif ( 'post_tag' != $taxonomy )
+ $option = 'edit_' . $taxonomy . '_per_page';
+ }
+
</ins><span class="cx"> $per_page = (int) get_user_option( $option );
</span><span class="cx"> if ( empty( $per_page ) || $per_page < 1 ) {
</span><span class="cx"> if ( 'plugins' == $screen->id )
</span><span class="lines">@@ -3659,9 +3669,10 @@
</span><span class="cx"> else
</span><span class="cx"> $per_page = 20;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ( 'edit_comments_per_page' == $option )
</span><span class="cx"> $per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
</span><del>- elseif ( 'categories' == $option )
</del><ins>+ elseif ( 'categories_per_page' == $option )
</ins><span class="cx"> $per_page = apply_filters( 'edit_categories_per_page', $per_page );
</span><span class="cx"> else
</span><span class="cx"> $per_page = apply_filters( $option, $per_page );
</span></span></pre>
</div>
</div>
</body>
</html>