<!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>[16193] trunk/wp-admin/network/themes.php: Network Themes cleanup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16193">16193</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-04 20:11:08 +0000 (Thu, 04 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network Themes cleanup. Props PeteMall. See <a href="http://trac.wordpress.org/ticket/14897">#14897</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (16192 => 16193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2010-11-04 20:04:31 UTC (rev 16192)
+++ trunk/wp-admin/network/themes.php 2010-11-04 20:11:08 UTC (rev 16193)
</span><span class="lines">@@ -14,11 +14,10 @@
</span><span class="cx">
</span><span class="cx"> $action = $wp_list_table->current_action();
</span><span class="cx">
</span><del>-$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
</del><span class="cx"> $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
</span><span class="cx">
</span><span class="cx"> // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
</span><del>-$_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
</del><ins>+$_SERVER['REQUEST_URI'] = remove_query_arg(array('network-enable', 'network-disable', 'network-enable-selected', 'network-disable-selected'), $_SERVER['REQUEST_URI']);
</ins><span class="cx">
</span><span class="cx"> if ( $action ) {
</span><span class="cx"> $allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="lines">@@ -36,8 +35,6 @@
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'network-enable-selected':
</span><del>- check_admin_referer('bulk-plugins');
-
</del><span class="cx"> $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><span class="cx"> if ( empty($themes) ) {
</span><span class="cx"> wp_redirect( wp_get_referer() );
</span><span class="lines">@@ -47,19 +44,16 @@
</span><span class="cx"> $allowed_themes[ $theme ] = 1;
</span><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><span class="cx"> break;
</span><del>- case 'network-disable-selected':
- check_admin_referer('bulk-plugins');
-
- $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
- if ( empty($themes) ) {
- wp_redirect( wp_get_referer() );
- exit;
- }
- foreach( (array) $themes as $theme )
- unset( $allowed_themes[ $theme ] );
- update_site_option( 'allowedthemes', $allowed_themes );
- break;
-
</del><ins>+ case 'network-disable-selected':
+ $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+ if ( empty($themes) ) {
+ wp_redirect( wp_get_referer() );
+ exit;
+ }
+ foreach( (array) $themes as $theme )
+ unset( $allowed_themes[ $theme ] );
+ update_site_option( 'allowedthemes', $allowed_themes );
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>