<!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>[16241] trunk/wp-admin: Use bool for allowed themes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16241">16241</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-08 19:40:05 +0000 (Mon, 08 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use bool for allowed 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="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/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 (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-11-08 17:45:20 UTC (rev 16240)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-11-08 19:40:05 UTC (rev 16241)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx"> $current = get_site_transient( 'update_themes' );
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $themes['all'] as $key => $theme ) {
</span><del>- if ( array_key_exists( $theme['Template'], $allowed_themes ) ) {
</del><ins>+ $theme_key = esc_html( $theme['Stylesheet'] );
+ if ( isset( $allowed_themes [ $theme_key ] ) ) {
</ins><span class="cx"> $themes['all'][$key]['enabled'] = true;
</span><span class="cx"> $themes['enabled'][$key] = $themes['all'][$key];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (16240 => 16241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2010-11-08 17:45:20 UTC (rev 16240)
+++ trunk/wp-admin/network/themes.php 2010-11-08 19:40:05 UTC (rev 16241)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> $allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'network-enable':
</span><del>- $allowed_themes[ $_GET['theme'] ] = 1;
</del><ins>+ $allowed_themes[ $_GET['theme'] ] = true;
</ins><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><span class="cx"> wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
</span><span class="cx"> exit;
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> foreach( (array) $themes as $theme )
</span><del>- $allowed_themes[ $theme ] = 1;
</del><ins>+ $allowed_themes[ $theme ] = true;
</ins><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><span class="cx"> break;
</span><span class="cx"> case 'network-disable-selected':
</span></span></pre>
</div>
</div>
</body>
</html>