
<!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>[12816] trunk/wp-admin/edit-tags.php:

  Fix Tag paging number whilst searching.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12816">12816</a></dd>

<dt>Author</dt> <dd>dd32</dd>

<dt>Date</dt> <dd>2010-01-24 02:07:13 +0000 (Sun, 24 Jan 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Fix Tag paging number whilst searching. Fixes <a href="http://trac.wordpress.org/ticket/11989">#11989</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.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 (12815 => 12816)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/edit-tags.php        2010-01-23 23:07:56 UTC (rev 12815)

+++ trunk/wp-admin/edit-tags.php        2010-01-24 02:07:13 UTC (rev 12816)

</span><span class="lines">@@ -200,12 +200,17 @@

</span><span class="cx"> $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );

</span><span class="cx"> $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter

</span><span class="cx"> 

</span><ins>+if ( !empty($_GET['s']) )

+        $total_terms = count( get_terms( $taxonomy, array( 'search' =&gt; trim(stripslashes($_GET['s'])), 'number' =&gt; 0, 'hide_empty' =&gt; 0 ) ) );

+else

+        $total_terms = wp_count_terms($taxonomy);

+

</ins><span class="cx"> $page_links = paginate_links( array(

</span><span class="cx">         'base' =&gt; add_query_arg( 'pagenum', '%#%' ),

</span><span class="cx">         'format' =&gt; '',

</span><span class="cx">         'prev_text' =&gt; __('&amp;laquo;'),

</span><span class="cx">         'next_text' =&gt; __('&amp;raquo;'),

</span><del>-        'total' =&gt; ceil(wp_count_terms($taxonomy) / $tags_per_page),

</del><ins>+        'total' =&gt; ceil($total_terms / $tags_per_page),

</ins><span class="cx">         'current' =&gt; $pagenum

</span><span class="cx"> ));

</span><span class="cx"> 

</span><span class="lines">@@ -310,7 +315,7 @@

</span><span class="cx"> &lt;div class=&quot;form-field&quot;&gt;

</span><span class="cx">         &lt;label for=&quot;description&quot;&gt;&lt;?php _e('Description') ?&gt;&lt;/label&gt;

</span><span class="cx">         &lt;textarea name=&quot;description&quot; id=&quot;description&quot; rows=&quot;5&quot; cols=&quot;40&quot;&gt;&lt;/textarea&gt;

</span><del>-    &lt;p&gt;&lt;?php _e('The description is not prominent by default; however, some themes may show it.'); ?&gt;&lt;/p&gt;

</del><ins>+        &lt;p&gt;&lt;?php _e('The description is not prominent by default; however, some themes may show it.'); ?&gt;&lt;/p&gt;

</ins><span class="cx"> &lt;/div&gt;

</span><span class="cx"> 

</span><span class="cx"> &lt;p class=&quot;submit&quot;&gt;&lt;input type=&quot;submit&quot; class=&quot;button&quot; name=&quot;submit&quot; id=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Add Tag'); ?&gt;&quot; /&gt;&lt;/p&gt;

</span></span></pre>

</div>

</div>


</body>

</html>