<!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>[16606] trunk/wp-admin/network/site-themes.php:
Update and error messages for site-themes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16606">16606</a></dd>
<dt>Author</dt> <dd>PeteMall</dd>
<dt>Date</dt> <dd>2010-11-29 07:24:54 +0000 (Mon, 29 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update and error messages for site-themes. See <a href="http://trac.wordpress.org/ticket/14897">#14897</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (16605 => 16606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2010-11-29 05:39:39 UTC (rev 16605)
+++ trunk/wp-admin/network/site-themes.php 2010-11-29 07:24:54 UTC (rev 16606)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'enable':
</span><span class="cx"> $theme = $_GET['theme'];
</span><ins>+ $update = 'enabled';
</ins><span class="cx"> if ( !$allowed_themes )
</span><span class="cx"> $allowed_themes = array( $theme => true );
</span><span class="cx"> else
</span><span class="lines">@@ -50,37 +51,38 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'disable':
</span><span class="cx"> $theme = $_GET['theme'];
</span><ins>+ $update = 'disabled';
</ins><span class="cx"> if ( !$allowed_themes )
</span><span class="cx"> $allowed_themes = array();
</span><span class="cx"> else
</span><span class="cx"> unset( $allowed_themes[$theme] );
</span><span class="cx"> break;
</span><span class="cx"> case 'enable-selected':
</span><del>- $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
- if ( empty($themes) ) {
- restore_current_blog();
- wp_redirect( wp_get_referer() );
- exit;
- }
- foreach( (array) $themes as $theme )
- $allowed_themes[ $theme ] = true;
</del><ins>+ if ( isset( $_POST['checked'] ) ) {
+ $update = 'enable';
+ $themes = (array) $_POST['checked'];
+ foreach( (array) $themes as $theme )
+ $allowed_themes[ $theme ] = true;
+ } else {
+ $update = 'error';
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case 'disable-selected':
</span><del>- $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
- if ( empty($themes) ) {
- restore_current_blog();
- wp_redirect( wp_get_referer() );
- exit;
- }
- foreach( (array) $themes as $theme )
- unset( $allowed_themes[ $theme ] );
</del><ins>+ if ( isset( $_POST['checked'] ) ) {
+ $update = 'disable';
+ $themes = (array) $_POST['checked'];
+ foreach( (array) $themes as $theme )
+ unset( $allowed_themes[ $theme ] );
+ } else {
+ $update = 'error';
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> update_option( 'allowedthemes', $allowed_themes );
</span><span class="cx"> restore_current_blog();
</span><span class="cx">
</span><del>- wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
</del><ins>+ wp_redirect( add_query_arg( 'update', $update, wp_get_referer() ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,7 +112,22 @@
</span><span class="cx"> echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-</h3>
</del><ins>+</h3><?php
+
+if ( isset( $_GET['update'] ) ) {
+ switch ( $_GET['update'] ) {
+ case 'enabled':
+ echo '<div id="message" class="updated"><p>' . __( 'Theme enabled.' ) . '</p></div>';
+ break;
+ case 'disabled':
+ echo '<div id="message" class="updated"><p>' . __( 'Theme disabled.' ) . '</p></div>';
+ break;
+ case 'error':
+ echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
+ break;
+ }
+} ?>
+
</ins><span class="cx"> <p><?php _e( 'Network enabled themes are not shown on this screen.' ) ?></p>
</span><span class="cx">
</span><span class="cx"> <form method="get" action="">
</span></span></pre>
</div>
</div>
</body>
</html>