WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more multisite UI rebranding, See #11644 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-26 19:08:01 +00:00
parent da2634030a
commit ab6e21f6fb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/ms.php
View File

@ -176,7 +176,7 @@ function confirm_delete_users( $users ) {
if ( $val != '' && $val != '0' ) { if ( $val != '' && $val != '0' ) {
$user = new WP_User( $val ); $user = new WP_User( $val );
if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) )
wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a site admnistrator.' ), $user->user_login ) ); wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $user->user_login ) );
echo "<input type='hidden' name='user[]' value='{$val}'/>\n"; echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
$blogs = get_blogs_of_user( $val, true ); $blogs = get_blogs_of_user( $val, true );
if ( !empty( $blogs ) ) { if ( !empty( $blogs ) ) {
@ -248,7 +248,7 @@ function update_option_new_admin_email($old_value, $value) {
$content = apply_filters( 'new_admin_email_content', __("Dear user, $content = apply_filters( 'new_admin_email_content', __("Dear user,
You recently requested to have the administration email address on You recently requested to have the administration email address on
your blog changed. your site changed.
If this is correct, please click on the following link to change it: If this is correct, please click on the following link to change it:
###ADMIN_URL### ###ADMIN_URL###
@ -461,8 +461,8 @@ function upload_space_setting( $id ) {
?> ?>
<tr> <tr>
<th><?php _e('Blog Upload Space Quota'); ?></th> <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 site default)'); ?></td> <td><input type="text" size="3" name="option[blog_upload_space]" value="<?php echo $quota; ?>" /><?php _e('MB (Leave blank for network default)'); ?></td>
</tr> </tr>
<?php <?php
} }
@ -523,7 +523,7 @@ function redirect_user_to_blog() {
$c = (int)$_GET[ 'c' ]; $c = (int)$_GET[ 'c' ];
if ( $c >= 5 ) { if ( $c >= 5 ) {
wp_die( __( "You don&#8217;t have permission to view this blog. Please contact the system administrator." ) ); wp_die( __( "You don&#8217;t have permission to view this site. Please contact the system administrator." ) );
} }
$c ++; $c ++;
@ -650,9 +650,9 @@ function site_admin_notice() {
global $current_user, $wp_db_version; global $current_user, $wp_db_version;
if ( !is_super_admin() ) if ( !is_super_admin() )
return false; return false;
printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login); printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a network administrator.") . "</div>", $current_user->user_login);
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) { if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
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>"; 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>";
} }
} }
add_action( 'admin_notices', 'site_admin_notice' ); add_action( 'admin_notices', 'site_admin_notice' );