<!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>[16298] trunk/wp-admin: Add screen options to site-themes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16298">16298</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-11 15:16:16 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add screen options to site-themes. Props PeteMall. see <a href="http://trac.wordpress.org/ticket/14897">#14897</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmsthemeslisttablephp">trunk/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-11-11 14:34:51 UTC (rev 16297)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-11-11 15:16:16 UTC (rev 16298)
</span><span class="lines">@@ -60,10 +60,13 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $site_allowed_themes = get_site_allowed_themes();
</span><del>- if ( !$this->is_site_themes )
- $allowed_themes = $site_allowed_themes;
- else
</del><ins>+ if ( !$this->is_site_themes ) {
+ $allowed_themes = $site_allowed_themes;
+ $themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
+ } else {
</ins><span class="cx"> $allowed_themes = wpmu_get_blog_allowedthemes( $this->site_id );
</span><ins>+ $themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
+ }
</ins><span class="cx">
</span><span class="cx"> $current = get_site_transient( 'update_themes' );
</span><span class="cx">
</span><span class="lines">@@ -113,8 +116,6 @@
</span><span class="cx"> uasort( $this->items, array( &$this, '_order_callback' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
-
</del><span class="cx"> $start = ( $page - 1 ) * $themes_per_page;
</span><span class="cx">
</span><span class="cx"> if ( $total_this_page > $themes_per_page )
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-11-11 14:34:51 UTC (rev 16297)
+++ trunk/wp-admin/includes/misc.php 2010-11-11 15:16:16 UTC (rev 16298)
</span><span class="lines">@@ -353,6 +353,7 @@
</span><span class="cx"> case 'users_network_per_page':
</span><span class="cx"> case 'plugins_network_per_page':
</span><span class="cx"> case 'themes_network_per_page':
</span><ins>+ case 'site_themes_network_per_page':
</ins><span class="cx"> $value = (int) $value;
</span><span class="cx"> if ( $value < 1 || $value > 999 )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2010-11-11 14:34:51 UTC (rev 16297)
+++ trunk/wp-admin/network/site-themes.php 2010-11-11 15:16:16 UTC (rev 16298)
</span><span class="lines">@@ -86,16 +86,15 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+add_thickbox();
+add_screen_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
+
</ins><span class="cx"> $title = sprintf( __('Edit Site: %s'), get_blogaddress_by_id($id));
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx"> $submenu_file = 'sites.php';
</span><span class="cx">
</span><span class="cx"> require('../admin-header.php');
</span><span class="cx">
</span><del>-add_thickbox();
-
-add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' ), 'default' => 999) );
-
</del><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>