<!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>[13435] trunk/wp-admin/includes/ms.php: more multisite UI rebranding,
See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13435">13435</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-26 19:08:01 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>more multisite UI rebranding, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13434 => 13435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-02-26 19:06:09 UTC (rev 13434)
+++ trunk/wp-admin/includes/ms.php 2010-02-26 19:08:01 UTC (rev 13435)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> if ( $val != '' && $val != '0' ) {
</span><span class="cx"> $user = new WP_User( $val );
</span><span class="cx"> if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) )
</span><del>- wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a site admnistrator.' ), $user->user_login ) );
</del><ins>+ wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $user->user_login ) );
</ins><span class="cx"> echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
</span><span class="cx"> $blogs = get_blogs_of_user( $val, true );
</span><span class="cx"> if ( !empty( $blogs ) ) {
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> $content = apply_filters( 'new_admin_email_content', __("Dear user,
</span><span class="cx">
</span><span class="cx"> You recently requested to have the administration email address on
</span><del>-your blog changed.
</del><ins>+your site changed.
</ins><span class="cx"> If this is correct, please click on the following link to change it:
</span><span class="cx"> ###ADMIN_URL###
</span><span class="cx">
</span><span class="lines">@@ -461,8 +461,8 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <tr>
</span><del>- <th><?php _e('Blog Upload Space Quota'); ?></th>
- <td><input type="text" size="3" name="option[blog_upload_space]" value="<?php echo $quota; ?>" /><?php _e('MB (Leave blank for site default)'); ?></td>
</del><ins>+ <th><?php _e('Site Upload Space Quota'); ?></th>
+ <td><input type="text" size="3" name="option[blog_upload_space]" value="<?php echo $quota; ?>" /><?php _e('MB (Leave blank for network default)'); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> $c = (int)$_GET[ 'c' ];
</span><span class="cx">
</span><span class="cx"> if ( $c >= 5 ) {
</span><del>- wp_die( __( "You don&#8217;t have permission to view this blog. Please contact the system administrator." ) );
</del><ins>+ wp_die( __( "You don&#8217;t have permission to view this site. Please contact the system administrator." ) );
</ins><span class="cx"> }
</span><span class="cx"> $c ++;
</span><span class="cx">
</span><span class="lines">@@ -650,9 +650,9 @@
</span><span class="cx"> global $current_user, $wp_db_version;
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="cx"> return false;
</span><del>- printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login);
</del><ins>+ printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a network administrator.") . "</div>", $current_user->user_login);
</ins><span class="cx"> if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
</span><del>- echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-network.php">Upgrade Network</a> page to update all your blogs.' ) . "</div>";
</del><ins>+ echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-network.php">Upgrade Network</a> page to update all your sites.' ) . "</div>";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span></span></pre>
</div>
</div>
</body>
</html>