<!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>[15673] trunk/wp-admin/network/sites.php: Don'
t echo the updated div on sites.php before the admin header.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15673">15673</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-09-28 18:21:46 +0000 (Tue, 28 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't echo the updated div on sites.php before the admin header.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (15672 => 15673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-09-27 23:48:03 UTC (rev 15672)
+++ trunk/wp-admin/network/sites.php 2010-09-28 18:21:46 UTC (rev 15673)
</span><span class="lines">@@ -48,51 +48,48 @@
</span><span class="cx">
</span><span class="cx"> $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="cx">
</span><ins>+$msg = '';
</ins><span class="cx"> if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
</span><del>- ?>
- <div id="message" class="updated"><p>
- <?php
- switch ( $_REQUEST['action'] ) {
- case 'all_notspam':
- _e( 'Sites removed from spam.' );
- break;
- case 'all_spam':
- _e( 'Sites marked as spam.' );
- break;
- case 'all_delete':
- _e( 'Sites deleted.' );
- break;
- case 'delete':
- _e( 'Site deleted.' );
- break;
- case 'add-blog':
- _e( 'Site added.' );
- break;
- case 'archive':
- _e( 'Site archived.' );
- break;
- case 'unarchive':
- _e( 'Site unarchived.' );
- break;
- case 'activate':
- _e( 'Site activated.' );
- break;
- case 'deactivate':
- _e( 'Site deactivated.' );
- break;
- case 'unspam':
- _e( 'Site removed from spam.' );
- break;
- case 'spam':
- _e( 'Site marked as spam.' );
- break;
- default:
- _e( 'Settings saved.' );
- break;
- }
- ?>
- </p></div>
- <?php
</del><ins>+ switch ( $_REQUEST['action'] ) {
+ case 'all_notspam':
+ $msg = __( 'Sites removed from spam.' );
+ break;
+ case 'all_spam':
+ $msg = __( 'Sites marked as spam.' );
+ break;
+ case 'all_delete':
+ $msg = __( 'Sites deleted.' );
+ break;
+ case 'delete':
+ $msg = __( 'Site deleted.' );
+ break;
+ case 'add-blog':
+ $msg = __( 'Site added.' );
+ break;
+ case 'archive':
+ $msg = __( 'Site archived.' );
+ break;
+ case 'unarchive':
+ $msg = __( 'Site unarchived.' );
+ break;
+ case 'activate':
+ $msg = __( 'Site activated.' );
+ break;
+ case 'deactivate':
+ $msg = __( 'Site deactivated.' );
+ break;
+ case 'unspam':
+ $msg = __( 'Site removed from spam.' );
+ break;
+ case 'spam':
+ $msg = __( 'Site marked as spam.' );
+ break;
+ default:
+ $msg = __( 'Settings saved.' );
+ break;
+ }
+ if ( $msg )
+ $msg = '<div class="updated" id="message"><p>' . $msg . '</p></div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'list';
</span><span class="lines">@@ -114,6 +111,7 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo esc_url( get_home_url( $id ) ); ?>"><?php echo esc_url( get_home_url( $id ) ); ?></a></h2>
</span><ins>+ <?php echo $msg; ?>
</ins><span class="cx"> <form method="post" action="edit.php?action=updateblog">
</span><span class="cx"> <?php wp_nonce_field( 'editblog' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="lines">@@ -351,6 +349,7 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e('Sites') ?>
</span><ins>+ <?php echo $msg; ?>
</ins><span class="cx"> <a href="#form-add-site" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
</span><span class="cx"> <?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
</span><span class="cx"> printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
</span></span></pre>
</div>
</div>
</body>
</html>