From fd475d2b3823921fba16d852f0477cf32af88319 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 7 Jan 2010 00:30:53 +0000 Subject: [PATCH] s/wpmu/ms/ in file refs. Props Denis-de-Bernardy. see #11644 git-svn-id: http://svn.automattic.com/wordpress/trunk@12622 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 8 ++++---- wp-admin/ms-admin.php | 10 +++++----- wp-admin/ms-edit.php | 12 ++++++------ wp-admin/ms-options.php | 2 +- wp-admin/ms-sites.php | 12 ++++++------ wp-admin/ms-upgrade-site.php | 8 ++++---- wp-admin/ms-users.php | 12 ++++++------ wp-includes/ms-functions.php | 4 ++-- wp-signup.php | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 84bacf86fa..cf11e01ea6 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -731,7 +731,7 @@ function site_admin_notice() { return false; printf("
" . __("Hi %s! You're logged in as a site administrator.") . "
", $current_user->user_login); if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) { - echo "
" . __( 'Thank you for Upgrading! Please visit the Upgrade Site page to update all your blogs.' ) . "
"; + echo "
" . __( 'Thank you for Upgrading! Please visit the Upgrade Site page to update all your blogs.' ) . "
"; } } add_action( 'admin_notices', 'site_admin_notice' ); @@ -837,7 +837,7 @@ add_action( 'after_plugin_row', 'add_sitewide_activate_row', 9, 3 ); * be activated as a site wide MU plugin. */ function is_wpmu_sitewide_plugin( $file ) { - /* Open the plugin file for reading to check if this is a wpmu-plugin. */ + /* Open the plugin file for reading to check if this is a ms-plugin. */ $fp = @fopen( WP_PLUGIN_DIR . '/' . $file, 'r' ); /* Pull only the first 8kiB of the file in. */ @@ -1092,7 +1092,7 @@ function disable_some_pages() { if ( strpos( $_SERVER['PHP_SELF'], 'user-new.php' ) && !get_site_option( 'add_new_users' ) ) { if ( is_site_admin() ) { - $messages[] = '

' . __( 'Warning! Only site administrators may see this page. Everyone else will see a page disabled message. Enable it again on the options page.' ) . '

'; + $messages[] = '

' . __( 'Warning! Only site administrators may see this page. Everyone else will see a page disabled message. Enable it again on the options page.' ) . '

'; } else { wp_die( __('Page disabled by the administrator') ); } @@ -1253,7 +1253,7 @@ function show_post_thumbnail_warning() { } $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); if ( !$mu_media_buttons[ 'image' ] && current_theme_supports( 'post-thumbnails' ) ) { - echo "
" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on the options page for it to work." ), admin_url( 'wpmu-options.php' ) ) . "
"; + echo "
" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on the options page for it to work." ), admin_url( 'ms-options.php' ) ) . "
"; } } add_action( 'admin_notices', 'show_post_thumbnail_warning' ); diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php index 4fc86a027b..f2271b503b 100644 --- a/wp-admin/ms-admin.php +++ b/wp-admin/ms-admin.php @@ -5,7 +5,7 @@ if ( !is_multisite() ) wp_die( __('Multisite support is not enabled.') ); $title = __('WordPress MU › Admin'); -$parent_file = 'wpmu-admin.php'; +$parent_file = 'ms-admin.php'; function index_css() { wp_admin_css( 'css/dashboard' ); @@ -33,15 +33,15 @@ $title = __( 'WordPress MU : Admin' );


-
+

@@ -49,7 +49,7 @@ $title = __( 'WordPress MU : Admin' );

-
+

diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index 08babdd8d7..983f995139 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -24,7 +24,7 @@ switch( $_GET['action'] ) { case "siteoptions": check_admin_referer('siteoptions'); if( empty( $_POST ) ) - wp_die( __("You probably need to go back to the options page") ); + wp_die( __("You probably need to go back to the options page") ); update_site_option( "WPLANG", $_POST['WPLANG'] ); @@ -127,7 +127,7 @@ switch( $_GET['action'] ) { // Update more options here do_action( 'update_wpmu_options' ); - wp_redirect( add_query_arg( "updated", "true", 'wpmu-options.php' ) ); + wp_redirect( add_query_arg( "updated", "true", 'ms-options.php' ) ); exit(); break; case "addblog": @@ -186,7 +186,7 @@ switch( $_GET['action'] ) { case "updateblog": check_admin_referer('editblog'); if( empty( $_POST ) ) - wp_die( __('You probably need to go back to the blogs page') ); + wp_die( __('You probably need to go back to the blogs page') ); // themes if( is_array( $_POST[ 'theme' ] ) ) { @@ -295,7 +295,7 @@ switch( $_GET['action'] ) { } do_action( 'wpmu_update_blog_options' ); restore_current_blog(); - wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id ); + wpmu_admin_do_redirect( "ms-blogs.php?action=editblog&updated=true&id=".$id ); break; case "deleteblog": @@ -467,7 +467,7 @@ switch( $_GET['action'] ) { foreach( $_POST[ 'user' ] as $id ) wpmu_delete_user( $id ); - wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'wpmu-users.php' ) ); + wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'ms-users.php' ) ); } else { foreach ( (array) $_POST['allusers'] as $key => $val ) { if( $val == '' || $val == '0' ) { @@ -533,7 +533,7 @@ switch( $_GET['action'] ) { break; default: - wpmu_admin_do_redirect( "wpmu-admin.php" ); + wpmu_admin_do_redirect( "ms-admin.php" ); break; } ?> diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index 2aa1f48ee1..76279a7640 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -5,7 +5,7 @@ if ( !is_multisite() ) wp_die( __('Multisite support is not enabled.') ); $title = __('WordPress MU › Admin › Site Options'); -$parent_file = 'wpmu-admin.php'; +$parent_file = 'ms-admin.php'; include('admin-header.php'); diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php index 4607ceaeeb..8fbffc94af 100644 --- a/wp-admin/ms-sites.php +++ b/wp-admin/ms-sites.php @@ -5,7 +5,7 @@ if ( !is_multisite() ) wp_die( __('Multisite support is not enabled.') ); $title = __('WordPress MU › Admin › Blogs'); -$parent_file = 'wpmu-admin.php'; +$parent_file = 'ms-admin.php'; wp_enqueue_script( 'admin-forms' ); @@ -369,7 +369,7 @@ switch( $_GET['action'] ) {

- + @@ -394,7 +394,7 @@ switch( $_GET['action'] ) {
-

+

$column_display_name) { - $column_link = " - +
' . __('Edit') . ''; + $controlActions[] = '' . __('Edit') . ''; $controlActions[] = "" . __('Backend') . ''; if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' ) diff --git a/wp-admin/ms-upgrade-site.php b/wp-admin/ms-upgrade-site.php index 750c6b5995..4ecf1c7f83 100644 --- a/wp-admin/ms-upgrade-site.php +++ b/wp-admin/ms-upgrade-site.php @@ -7,7 +7,7 @@ if ( !is_multisite() ) require_once( ABSPATH . WPINC . '/http.php' ); $title = __('WordPress MU › Admin › Upgrade Site'); -$parent_file = 'wpmu-admin.php'; +$parent_file = 'ms-admin.php'; require_once('admin-header.php'); if ( is_site_admin() == false ) { @@ -41,11 +41,11 @@ switch( $_GET['action'] ) { } } echo ""; - ?>

+ ?>