WordPress.org

Make WordPress Core

Changeset 12622


Ignore:
Timestamp:
01/07/10 00:30:53 (4 years ago)
Author:
ryan
Message:

s/wpmu/ms/ in file refs. Props Denis-de-Bernardy. see #11644

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/ms.php

    r12620 r12622  
    732732    printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login); 
    733733    if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) { 
    734         echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="wpmu-upgrade-site.php">Upgrade Site</a> page to update all your blogs.' ) . "</div>"; 
     734        echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-site.php">Upgrade Site</a> page to update all your blogs.' ) . "</div>"; 
    735735    } 
    736736} 
     
    838838 */ 
    839839function is_wpmu_sitewide_plugin( $file ) { 
    840     /* Open the plugin file for reading to check if this is a wpmu-plugin. */ 
     840    /* Open the plugin file for reading to check if this is a ms-plugin. */ 
    841841    $fp = @fopen( WP_PLUGIN_DIR . '/' . $file, 'r' ); 
    842842     
     
    10931093    if ( strpos( $_SERVER['PHP_SELF'], 'user-new.php' ) && !get_site_option( 'add_new_users' ) ) { 
    10941094        if ( is_site_admin() ) { 
    1095             $messages[] = '<div id="message" class="updated fade"><p>' . __( 'Warning! Only site administrators may see this page. Everyone else will see a <em>page disabled</em> message. Enable it again on <a href="wpmu-options.php#addnewusers">the options page</a>.' ) . '</p></div>'; 
     1095            $messages[] = '<div id="message" class="updated fade"><p>' . __( 'Warning! Only site administrators may see this page. Everyone else will see a <em>page disabled</em> message. Enable it again on <a href="ms-options.php#addnewusers">the options page</a>.' ) . '</p></div>'; 
    10961096        } else { 
    10971097            wp_die( __('Page disabled by the administrator') ); 
     
    12541254    $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); 
    12551255    if ( !$mu_media_buttons[ 'image' ] && current_theme_supports( 'post-thumbnails' ) ) { 
    1256         echo "<div id='update-nag'>" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), admin_url( 'wpmu-options.php' ) ) . "</div>"; 
     1256        echo "<div id='update-nag'>" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), admin_url( 'ms-options.php' ) ) . "</div>"; 
    12571257    } 
    12581258} 
  • trunk/wp-admin/ms-admin.php

    r12610 r12622  
    66 
    77$title = __('WordPress MU &rsaquo; Admin'); 
    8 $parent_file = 'wpmu-admin.php'; 
     8$parent_file = 'ms-admin.php'; 
    99 
    1010function index_css() { 
     
    3434 
    3535    <ul class="subsubsub"> 
    36     <li><a href="wpmu-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li> 
    37     <li><a href="wpmu-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li> 
     36    <li><a href="ms-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li> 
     37    <li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li> 
    3838    </ul> 
    3939    <br clear='all' /> 
     
    4242    <?php do_action('wpmuadminresult', ''); ?> 
    4343 
    44     <form name="searchform" action="wpmu-users.php" method="get"> 
     44    <form name="searchform" action="ms-users.php" method="get"> 
    4545        <p> 
    4646            <input type="hidden" name="action" value="users" /> 
     
    5050    </form> 
    5151 
    52     <form name="searchform" action="wpmu-blogs.php" method="get"> 
     52    <form name="searchform" action="ms-blogs.php" method="get"> 
    5353        <p> 
    5454            <input type="hidden" name="action" value="blogs" /> 
  • trunk/wp-admin/ms-edit.php

    r12620 r12622  
    2525        check_admin_referer('siteoptions'); 
    2626        if( empty( $_POST ) ) 
    27             wp_die( __("You probably need to go back to the <a href='wpmu-options.php'>options page</a>") ); 
     27            wp_die( __("You probably need to go back to the <a href='ms-options.php'>options page</a>") ); 
    2828 
    2929        update_site_option( "WPLANG", $_POST['WPLANG'] ); 
     
    128128        do_action( 'update_wpmu_options' ); 
    129129 
    130         wp_redirect( add_query_arg( "updated", "true", 'wpmu-options.php' ) ); 
     130        wp_redirect( add_query_arg( "updated", "true", 'ms-options.php' ) ); 
    131131        exit(); 
    132132    break; 
     
    187187        check_admin_referer('editblog'); 
    188188        if( empty( $_POST ) ) 
    189             wp_die( __('You probably need to go back to the <a href="wpmu-blogs.php">blogs page</a>') ); 
     189            wp_die( __('You probably need to go back to the <a href="ms-blogs.php">blogs page</a>') ); 
    190190 
    191191        // themes 
     
    296296        do_action( 'wpmu_update_blog_options' ); 
    297297        restore_current_blog(); 
    298         wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id ); 
     298        wpmu_admin_do_redirect( "ms-blogs.php?action=editblog&updated=true&id=".$id ); 
    299299    break; 
    300300 
     
    468468                    wpmu_delete_user( $id ); 
    469469 
    470             wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'wpmu-users.php' ) ); 
     470            wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'ms-users.php' ) ); 
    471471        } else { 
    472472            foreach ( (array) $_POST['allusers'] as $key => $val ) { 
     
    534534 
    535535    default: 
    536         wpmu_admin_do_redirect( "wpmu-admin.php" ); 
     536        wpmu_admin_do_redirect( "ms-admin.php" ); 
    537537    break; 
    538538} 
  • trunk/wp-admin/ms-options.php

    r12620 r12622  
    66 
    77$title = __('WordPress MU &rsaquo; Admin &rsaquo; Site Options'); 
    8 $parent_file = 'wpmu-admin.php'; 
     8$parent_file = 'ms-admin.php'; 
    99 
    1010include('admin-header.php'); 
  • trunk/wp-admin/ms-sites.php

    r12620 r12622  
    66 
    77$title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs'); 
    8 $parent_file = 'wpmu-admin.php'; 
     8$parent_file = 'ms-admin.php'; 
    99 
    1010wp_enqueue_script( 'admin-forms' ); 
     
    370370        <h2><?php _e('Blogs') ?></h2> 
    371371 
    372         <form action="wpmu-blogs.php" method="get" id="wpmu-search"> 
     372        <form action="ms-blogs.php" method="get" id="ms-search"> 
    373373            <input type="hidden" name="action" value="blogs" /> 
    374374            <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes( esc_attr( $s, 1 ) ); ?>" size="17" /> 
     
    395395 
    396396        <?php if( isset($_GET['s']) && !empty($_GET['s']) ) : ?> 
    397             <p><a href="wpmu-users.php?action=users&s=<?php echo urlencode( stripslashes( $s ) ) ?>"><?php _e('Search Users:') ?> <strong><?php echo stripslashes( $s ); ?></strong></a></p> 
     397            <p><a href="ms-users.php?action=users&s=<?php echo urlencode( stripslashes( $s ) ) ?>"><?php _e('Search Users:') ?> <strong><?php echo stripslashes( $s ); ?></strong></a></p> 
    398398        <?php endif; ?> 
    399399 
     
    427427                <th scope="col" class="check-column"></th> 
    428428                <?php foreach($posts_columns as $column_id => $column_display_name) { 
    429                     $column_link = "<a href='wpmu-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;"; 
     429                    $column_link = "<a href='ms-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;"; 
    430430                    if( $_GET['sortby'] == $column_id ) {  
    431431                        $column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;'; 
     
    471471                            case 'blogname': ?> 
    472472                                <td valign="top"> 
    473                                     <a href="wpmu-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a> 
     473                                    <a href="ms-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a> 
    474474                                    <br/> 
    475475                                    <?php 
    476476                                    $controlActions = array(); 
    477                                     $controlActions[]   = '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>'; 
     477                                    $controlActions[]   = '<a href="ms-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>'; 
    478478                                    $controlActions[]   = "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>'; 
    479479                                     
  • trunk/wp-admin/ms-upgrade-site.php

    r12610 r12622  
    88 
    99$title = __('WordPress MU &rsaquo; Admin &rsaquo; Upgrade Site'); 
    10 $parent_file = 'wpmu-admin.php'; 
     10$parent_file = 'ms-admin.php'; 
    1111require_once('admin-header.php'); 
    1212 
     
    4242            } 
    4343            echo "</ul>"; 
    44             ?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="wpmu-upgrade-site.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Blogs"); ?></a></p> 
     44            ?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-site.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Blogs"); ?></a></p> 
    4545            <script type='text/javascript'> 
    4646            <!-- 
    4747            function nextpage() { 
    48                 location.href = "wpmu-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>"; 
     48                location.href = "ms-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>"; 
    4949            } 
    5050            setTimeout( "nextpage()", 250 ); 
     
    5757    default:  
    5858        ?><p><?php _e("You can upgrade all the blogs on your site through this page. It works by calling the upgrade script of each blog automatically. Hit the link below to upgrade."); ?></p> 
    59         <p><a class="button" href="wpmu-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php 
     59        <p><a class="button" href="ms-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php 
    6060        do_action( 'wpmu_upgrade_page' ); 
    6161    break; 
  • trunk/wp-admin/ms-users.php

    r12621 r12622  
    66 
    77$title = __('WordPress MU &rsaquo; Admin &rsaquo; Users'); 
    8 $parent_file = 'wpmu-admin.php'; 
     8$parent_file = 'ms-admin.php'; 
    99 
    1010wp_enqueue_script( 'admin-forms' ); 
     
    104104    <div class="wrap"> 
    105105    <h2><?php _e( $current_site->site_name ); ?> <?php _e("Users"); ?></h2> 
    106     <form action="wpmu-users.php" method="get" class="search-form"> 
     106    <form action="ms-users.php" method="get" class="search-form"> 
    107107        <p class="search-box"> 
    108108        <input type="text" name="s" value="<?php if (isset($_GET['s'])) esc_attr( stripslashes( $s ) ); ?>" class="search-input" id="user-search-input" /> 
     
    126126 
    127127        <?php if( isset($_GET['s']) && $_GET['s'] != '' ) : ?> 
    128             <p><a href="wpmu-blogs.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p> 
     128            <p><a href="ms-blogs.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p> 
    129129        <?php endif; ?> 
    130130 
     
    150150                        echo '<th scope="col" class="check-column"><input type="checkbox" /></th>'; 
    151151                    } else { ?> 
    152                         <th scope="col"><a href="wpmu-users.php?sortby=<?php echo $column_id ?>&amp;<?php if( $_GET['sortby'] == $column_id ) { if( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th> 
     152                        <th scope="col"><a href="ms-users.php?sortby=<?php echo $column_id ?>&amp;<?php if( $_GET['sortby'] == $column_id ) { if( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th> 
    153153                    <?php } ?> 
    154154                <?php } ?> 
     
    221221                                        foreach ( (array) $blogs as $key => $val ) { 
    222222                                            $path   = ($val->path == '/') ? '' : $val->path; 
    223                                             echo '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>'; 
     223                                            echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>'; 
    224224                                            echo ' <small class="row-actions">'; 
    225225                                             
    226226                                            // Edit 
    227                                             echo '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | '; 
     227                                            echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | '; 
    228228                                             
    229229                                            // View 
  • trunk/wp-includes/ms-functions.php

    r12611 r12622  
    13551355        return false; 
    13561356     
    1357     $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/wpmu-options.php"); 
     1357    $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php"); 
    13581358 
    13591359    switch_to_blog( $blog_id ); 
     
    13831383    $user = new WP_User($user_id); 
    13841384 
    1385     $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/wpmu-options.php"); 
     1385    $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php"); 
    13861386    $msg = sprintf(__("New User: %1s 
    13871387Remote IP: %2s 
  • trunk/wp-signup.php

    r12606 r12622  
    376376 
    377377if( is_site_admin() ) 
    378     echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/wpmu-options.php'>Options page</a>." ), $active_signup ) . '</div>'; 
     378    echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>'; 
    379379 
    380380$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; 
Note: See TracChangeset for help on using the changeset viewer.