<!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>[12622] trunk: s/wpmu/ms/ in file refs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12622">12622</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-07 00:30:53 +0000 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/wpmu/ms/ in file refs. Props Denis-de-Bernardy. 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>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsupgradesitephp">trunk/wp-admin/ms-upgrade-site.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.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 (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/includes/ms.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login);
</span><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="wpmu-upgrade-site.php">Upgrade Site</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-site.php">Upgrade Site</a> page to update all your blogs.' ) . "</div>";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="lines">@@ -837,7 +837,7 @@
</span><span class="cx"> * be activated as a site wide MU plugin.
</span><span class="cx"> */
</span><span class="cx"> function is_wpmu_sitewide_plugin( $file ) {
</span><del>- /* Open the plugin file for reading to check if this is a wpmu-plugin. */
</del><ins>+ /* Open the plugin file for reading to check if this is a ms-plugin. */
</ins><span class="cx"> $fp = @fopen( WP_PLUGIN_DIR . '/' . $file, 'r' );
</span><span class="cx">
</span><span class="cx"> /* Pull only the first 8kiB of the file in. */
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx">
</span><span class="cx"> if ( strpos( $_SERVER['PHP_SELF'], 'user-new.php' ) && !get_site_option( 'add_new_users' ) ) {
</span><span class="cx"> if ( is_site_admin() ) {
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> } else {
</span><span class="cx"> wp_die( __('Page disabled by the administrator') );
</span><span class="cx"> }
</span><span class="lines">@@ -1253,7 +1253,7 @@
</span><span class="cx"> }
</span><span class="cx"> $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
</span><span class="cx"> if ( !$mu_media_buttons[ 'image' ] && current_theme_supports( 'post-thumbnails' ) ) {
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'show_post_thumbnail_warning' );
</span></span></pre></div>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/ms-admin.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><span class="cx"> $title = __('WordPress MU &rsaquo; Admin');
</span><del>-$parent_file = 'wpmu-admin.php';
</del><ins>+$parent_file = 'ms-admin.php';
</ins><span class="cx">
</span><span class="cx"> function index_css() {
</span><span class="cx"> wp_admin_css( 'css/dashboard' );
</span><span class="lines">@@ -33,15 +33,15 @@
</span><span class="cx"> <h2><?php echo wp_specialchars( $title ); ?></h2>
</span><span class="cx">
</span><span class="cx"> <ul class="subsubsub">
</span><del>- <li><a href="wpmu-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
- <li><a href="wpmu-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
</del><ins>+ <li><a href="ms-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
+ <li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> <br clear='all' />
</span><span class="cx">
</span><span class="cx"> <p class="youhave"><?php echo $sentence; ?></p>
</span><span class="cx"> <?php do_action('wpmuadminresult', ''); ?>
</span><span class="cx">
</span><del>- <form name="searchform" action="wpmu-users.php" method="get">
</del><ins>+ <form name="searchform" action="ms-users.php" method="get">
</ins><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="action" value="users" />
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>- <form name="searchform" action="wpmu-blogs.php" method="get">
</del><ins>+ <form name="searchform" action="ms-blogs.php" method="get">
</ins><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/ms-edit.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> case "siteoptions":
</span><span class="cx"> check_admin_referer('siteoptions');
</span><span class="cx"> if( empty( $_POST ) )
</span><del>- wp_die( __("You probably need to go back to the <a href='wpmu-options.php'>options page</a>") );
</del><ins>+ wp_die( __("You probably need to go back to the <a href='ms-options.php'>options page</a>") );
</ins><span class="cx">
</span><span class="cx"> update_site_option( "WPLANG", $_POST['WPLANG'] );
</span><span class="cx">
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> // Update more options here
</span><span class="cx"> do_action( 'update_wpmu_options' );
</span><span class="cx">
</span><del>- wp_redirect( add_query_arg( "updated", "true", 'wpmu-options.php' ) );
</del><ins>+ wp_redirect( add_query_arg( "updated", "true", 'ms-options.php' ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx"> case "addblog":
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> case "updateblog":
</span><span class="cx"> check_admin_referer('editblog');
</span><span class="cx"> if( empty( $_POST ) )
</span><del>- wp_die( __('You probably need to go back to the <a href="wpmu-blogs.php">blogs page</a>') );
</del><ins>+ wp_die( __('You probably need to go back to the <a href="ms-blogs.php">blogs page</a>') );
</ins><span class="cx">
</span><span class="cx"> // themes
</span><span class="cx"> if( is_array( $_POST[ 'theme' ] ) ) {
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> }
</span><span class="cx"> do_action( 'wpmu_update_blog_options' );
</span><span class="cx"> restore_current_blog();
</span><del>- wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id );
</del><ins>+ wpmu_admin_do_redirect( "ms-blogs.php?action=editblog&updated=true&id=".$id );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case "deleteblog":
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> foreach( $_POST[ 'user' ] as $id )
</span><span class="cx"> wpmu_delete_user( $id );
</span><span class="cx">
</span><del>- wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'wpmu-users.php' ) );
</del><ins>+ wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'ms-users.php' ) );
</ins><span class="cx"> } else {
</span><span class="cx"> foreach ( (array) $_POST['allusers'] as $key => $val ) {
</span><span class="cx"> if( $val == '' || $val == '0' ) {
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- wpmu_admin_do_redirect( "wpmu-admin.php" );
</del><ins>+ wpmu_admin_do_redirect( "ms-admin.php" );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/ms-options.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Site Options');
</span><del>-$parent_file = 'wpmu-admin.php';
</del><ins>+$parent_file = 'ms-admin.php';
</ins><span class="cx">
</span><span class="cx"> include('admin-header.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/ms-sites.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs');
</span><del>-$parent_file = 'wpmu-admin.php';
</del><ins>+$parent_file = 'ms-admin.php';
</ins><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'admin-forms' );
</span><span class="cx">
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> <div class="wrap" style="position:relative;">
</span><span class="cx"> <h2><?php _e('Blogs') ?></h2>
</span><span class="cx">
</span><del>- <form action="wpmu-blogs.php" method="get" id="wpmu-search">
</del><ins>+ <form action="ms-blogs.php" method="get" id="ms-search">
</ins><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes( esc_attr( $s, 1 ) ); ?>" size="17" />
</span><span class="cx"> <input type="submit" class="button" name="blog_name" value="<?php esc_attr_e('Search blogs by name') ?>" />
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> <br class="clear" />
</span><span class="cx">
</span><span class="cx"> <?php if( isset($_GET['s']) && !empty($_GET['s']) ) : ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="col" class="check-column"></th>
</span><span class="cx"> <?php foreach($posts_columns as $column_id => $column_display_name) {
</span><del>- $column_link = "<a href='wpmu-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
</del><ins>+ $column_link = "<a href='ms-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
</ins><span class="cx"> if( $_GET['sortby'] == $column_id ) {
</span><span class="cx"> $column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
</span><span class="cx"> }
</span><span class="lines">@@ -470,11 +470,11 @@
</span><span class="cx">
</span><span class="cx"> case 'blogname': ?>
</span><span class="cx"> <td valign="top">
</span><del>- <a href="wpmu-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
</del><ins>+ <a href="ms-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
</ins><span class="cx"> <br/>
</span><span class="cx"> <?php
</span><span class="cx"> $controlActions = array();
</span><del>- $controlActions[] = '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
</del><ins>+ $controlActions[] = '<a href="ms-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
</ins><span class="cx"> $controlActions[] = "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>';
</span><span class="cx">
</span><span class="cx"> if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
</span></span></pre></div>
<a id="trunkwpadminmsupgradesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-site.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-site.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/ms-upgrade-site.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx">
</span><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Upgrade Site');
</span><del>-$parent_file = 'wpmu-admin.php';
</del><ins>+$parent_file = 'ms-admin.php';
</ins><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><span class="cx"> if ( is_site_admin() == false ) {
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> echo "</ul>";
</span><del>- ?><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>
</del><ins>+ ?><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>
</ins><span class="cx"> <script type='text/javascript'>
</span><span class="cx"> <!--
</span><span class="cx"> function nextpage() {
</span><del>- location.href = "wpmu-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>";
</del><ins>+ location.href = "ms-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>";
</ins><span class="cx"> }
</span><span class="cx"> setTimeout( "nextpage()", 250 );
</span><span class="cx"> //-->
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> ?><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>
</span><del>- <p><a class="button" href="wpmu-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php
</del><ins>+ <p><a class="button" href="ms-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php
</ins><span class="cx"> do_action( 'wpmu_upgrade_page' );
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-admin/ms-users.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Users');
</span><del>-$parent_file = 'wpmu-admin.php';
</del><ins>+$parent_file = 'ms-admin.php';
</ins><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'admin-forms' );
</span><span class="cx">
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <h2><?php _e( $current_site->site_name ); ?> <?php _e("Users"); ?></h2>
</span><del>- <form action="wpmu-users.php" method="get" class="search-form">
</del><ins>+ <form action="ms-users.php" method="get" class="search-form">
</ins><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="text" name="s" value="<?php if (isset($_GET['s'])) esc_attr( stripslashes( $s ) ); ?>" class="search-input" id="user-search-input" />
</span><span class="cx"> <input type="submit" id="post-query-submit" value="<?php esc_attr_e('Search Users') ?>" class="button" />
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php if( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> } elseif( $column_id == 'checkbox') {
</span><span class="cx"> echo '<th scope="col" class="check-column"><input type="checkbox" /></th>';
</span><span class="cx"> } else { ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -220,11 +220,11 @@
</span><span class="cx"> if( is_array( $blogs ) ) {
</span><span class="cx"> foreach ( (array) $blogs as $key => $val ) {
</span><span class="cx"> $path = ($val->path == '/') ? '' : $val->path;
</span><del>- echo '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</del><ins>+ echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</ins><span class="cx"> echo ' <small class="row-actions">';
</span><span class="cx">
</span><span class="cx"> // Edit
</span><del>- echo '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
</del><ins>+ echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
</ins><span class="cx">
</span><span class="cx"> // View
</span><span class="cx"> echo '<a ';
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-includes/ms-functions.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> if( is_email($email) == false )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/wpmu-options.php");
</del><ins>+ $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
</ins><span class="cx">
</span><span class="cx"> switch_to_blog( $blog_id );
</span><span class="cx"> $blogname = get_option( 'blogname' );
</span><span class="lines">@@ -1382,7 +1382,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx">
</span><del>- $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/wpmu-options.php");
</del><ins>+ $options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
</ins><span class="cx"> $msg = sprintf(__("New User: %1s
</span><span class="cx"> Remote IP: %2s
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (12621 => 12622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-01-07 00:25:02 UTC (rev 12621)
+++ trunk/wp-signup.php 2010-01-07 00:30:53 UTC (rev 12622)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
</span><span class="cx">
</span><span class="cx"> if( is_site_admin() )
</span><del>- 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>';
</del><ins>+ 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>';
</ins><span class="cx">
</span><span class="cx"> $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>