<!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>[15263] trunk:
Make the number of taxonomies to display per page setting actually stick.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15263">15263</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-06-15 20:07:02 +0000 (Tue, 15 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the number of taxonomies to display per page setting actually stick. props nacin. fixes <a href="http://trac.wordpress.org/ticket/13899">#13899</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.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 (15262 => 15263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-06-15 16:21:22 UTC (rev 15262)
+++ trunk/wp-admin/edit-tags.php 2010-06-15 20:07:02 UTC (rev 15263)
</span><span class="lines">@@ -249,12 +249,7 @@
</span><span class="cx"> if ( empty($pagenum) )
</span><span class="cx"> $pagenum = 1;
</span><span class="cx">
</span><del>-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' );
</del><ins>+$tags_per_page = (int) get_user_option( 'edit_' . $taxonomy . '_per_page' );
</ins><span class="cx">
</span><span class="cx"> if ( empty($tags_per_page) || $tags_per_page < 1 )
</span><span class="cx"> $tags_per_page = 20;
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (15262 => 15263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-06-15 16:21:22 UTC (rev 15262)
+++ trunk/wp-admin/includes/misc.php 2010-06-15 20:07:02 UTC (rev 15263)
</span><span class="lines">@@ -337,14 +337,16 @@
</span><span class="cx"> $type = str_replace('_per_page', '', $type);
</span><span class="cx"> if ( in_array($type, get_post_types()) )
</span><span class="cx"> $map_option = 'edit_per_page';
</span><ins>+ if ( in_array( $type, get_taxonomies()) )
+ $map_option = 'edit_tags_per_page';
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> switch ( $map_option ) {
</span><span class="cx"> case 'edit_per_page':
</span><span class="cx"> case 'ms_sites_per_page':
</span><span class="cx"> case 'ms_users_per_page':
</span><span class="cx"> case 'edit_comments_per_page':
</span><span class="cx"> case 'upload_per_page':
</span><del>- case 'categories_per_page':
</del><span class="cx"> case 'edit_tags_per_page':
</span><span class="cx"> case 'plugins_per_page':
</span><span class="cx"> $value = (int) $value;
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (15262 => 15263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-06-15 16:21:22 UTC (rev 15262)
+++ trunk/wp-admin/includes/upgrade.php 2010-06-15 20:07:02 UTC (rev 15263)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> if ( $wp_current_db_version < 11958 )
</span><span class="cx"> upgrade_290();
</span><span class="cx">
</span><del>- if ( $wp_current_db_version < 15187 )
</del><ins>+ if ( $wp_current_db_version < 15260 )
</ins><span class="cx"> upgrade_300();
</span><span class="cx">
</span><span class="cx"> maybe_disable_automattic_widgets();
</span><span class="lines">@@ -1133,7 +1133,7 @@
</span><span class="cx"> if ( !is_multisite() || is_main_site() ) {
</span><span class="cx"> $prefix = like_escape($wpdb->base_prefix);
</span><span class="cx"> $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
</span><del>- OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden'" );
</del><ins>+ OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (15262 => 15263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2010-06-15 16:21:22 UTC (rev 15262)
+++ trunk/wp-includes/version.php 2010-06-15 20:07:02 UTC (rev 15263)
</span><span class="lines">@@ -8,14 +8,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.0-RC3-15257';
</del><ins>+$wp_version = '3.0-RC3-15260';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 15187;
</del><ins>+$wp_db_version = 15260;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>