<!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>[12620] trunk/wp-admin: Change references to wpmu-edit.php - See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12620">12620</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-07 00:24:03 +0000 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change references to wpmu-edit.php - 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="#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="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.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 (12619 => 12620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-01-07 00:21:19 UTC (rev 12619)
+++ trunk/wp-admin/includes/ms.php 2010-01-07 00:24:03 UTC (rev 12620)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> echo '<p>' . __( 'Transfer posts before deleting users:' ) . '</p>';
</span><span class="cx">
</span><del>- echo '<form action="wpmu-edit.php?action=allusers" method="post">';
</del><ins>+ echo '<form action="ms-edit.php?action=allusers" method="post">';
</ins><span class="cx"> echo '<input type="hidden" name="alluser_transfer_delete" />';
</span><span class="cx"> wp_nonce_field( 'allusers' );
</span><span class="cx"> foreach ( (array) $_POST['allusers'] as $key => $val ) {
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12619 => 12620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-01-07 00:21:19 UTC (rev 12619)
+++ trunk/wp-admin/ms-edit.php 2010-01-07 00:24:03 UTC (rev 12620)
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body id="error-page">
</span><span class="cx"> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
</span><del>- <form action='wpmu-edit.php?action=<?php echo wp_specialchars( $_GET[ 'action2' ] ) ?>' method='post'>
</del><ins>+ <form action='ms-edit.php?action=<?php echo wp_specialchars( $_GET[ 'action2' ] ) ?>' method='post'>
</ins><span class="cx"> <input type='hidden' name='action' value='<?php echo wp_specialchars( $_GET['action2'] ) ?>' />
</span><span class="cx"> <input type='hidden' name='id' value='<?php echo wp_specialchars( $id ); ?>' />
</span><span class="cx"> <input type='hidden' name='ref' value='<?php echo $referrer; ?>' />
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (12619 => 12620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-01-07 00:21:19 UTC (rev 12619)
+++ trunk/wp-admin/ms-options.php 2010-01-07 00:24:03 UTC (rev 12620)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <h2><?php _e('Site Options') ?></h2>
</span><del>- <form method="post" action="wpmu-edit.php?action=siteoptions">
</del><ins>+ <form method="post" action="ms-edit.php?action=siteoptions">
</ins><span class="cx"> <?php wp_nonce_field( "siteoptions" ); ?>
</span><span class="cx"> <h3><?php _e('Operational Settings <em>(These settings cannot be modified by blog owners)</em>') ?></h3>
</span><span class="cx"> <table class="form-table">
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12619 => 12620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-01-07 00:21:19 UTC (rev 12619)
+++ trunk/wp-admin/ms-sites.php 2010-01-07 00:24:03 UTC (rev 12620)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details['domain'].$details['path']; ?>'>http://<?php echo $details['domain'].$details['path']; ?></a></h2>
</span><del>- <form method="post" action="wpmu-edit.php?action=updateblog">
</del><ins>+ <form method="post" action="ms-edit.php?action=updateblog">
</ins><span class="cx"> <?php wp_nonce_field('editblog'); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
</span><span class="cx"> <div class='metabox-holder' style='width:49%;float:left;'>
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> <input type="submit" class="button" name="blog_ip" value="<?php esc_attr_e('by IP address') ?>" />
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>- <form id="form-blog-list" action="wpmu-edit.php?action=allblogs" method="post">
</del><ins>+ <form id="form-blog-list" action="ms-edit.php?action=allblogs" method="post">
</ins><span class="cx">
</span><span class="cx"> <div class="tablenav">
</span><span class="cx"> <?php if ( $blog_navigation ) echo "<div class='tablenav-pages'>$blog_navigation</div>"; ?>
</span><span class="lines">@@ -478,21 +478,21 @@
</span><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><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) . '">' . __('Activate') . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) . '">' . __('Activate') . '</a>';
</ins><span class="cx"> else
</span><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if( get_blog_status( $blog['blog_id'], "archived" ) == '1' )
</span><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';
</ins><span class="cx"> else
</span><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) . '">' . __('Archive') . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) . '">' . __('Archive') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if( get_blog_status( $blog['blog_id'], "spam" ) == '1' )
</span><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';
</ins><span class="cx"> else
</span><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';
</ins><span class="cx">
</span><del>- $controlActions[] = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) . '">' . __("Delete") . '</a>';
</del><ins>+ $controlActions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) . '">' . __("Delete") . '</a>';
</ins><span class="cx">
</span><span class="cx"> $controlActions[] = "<a href='http://{$blog['domain']}{$blog['path']}' rel='permalink'>" . __('Visit') . '</a>';
</span><span class="cx"> ?>
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <a name="form-add-blog"></a>
</span><span class="cx"> <h2><?php _e('Add Blog') ?></h2>
</span><del>- <form method="post" action="wpmu-edit.php?action=addblog">
</del><ins>+ <form method="post" action="ms-edit.php?action=addblog">
</ins><span class="cx"> <?php wp_nonce_field('add-blog') ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (12619 => 12620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-01-07 00:21:19 UTC (rev 12619)
+++ trunk/wp-admin/ms-users.php 2010-01-07 00:24:03 UTC (rev 12620)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <form id="form-user-list" action='wpmu-edit.php?action=allusers' method='post'>
</del><ins>+ <form id="form-user-list" action='ms-edit.php?action=allusers' method='post'>
</ins><span class="cx"> <div class="tablenav">
</span><span class="cx"> <?php if ( $user_navigation ) echo "<div class='tablenav-pages'>$user_navigation</div>"; ?>
</span><span class="cx">
</span><span class="lines">@@ -183,8 +183,8 @@
</span><span class="cx"> case 'login':
</span><span class="cx"> $avatar = get_avatar( $user['user_email'], 32 );
</span><span class="cx"> $edit = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=".$user['ID'] ) );
</span><del>- // @todo Make delete link work like delete button with transfering users (in wpmu-edit.php)
- //$delete = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), wp_nonce_url( 'wpmu-edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) );
</del><ins>+ // @todo Make delete link work like delete button with transfering users (in ms-edit.php)
+ //$delete = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) );
</ins><span class="cx"> ?>
</span><span class="cx"> <td class="username column-username">
</span><span class="cx"> <?php echo $avatar; ?><strong><a href="<?php echo $edit; ?>" class="edit"><?php echo stripslashes($user['user_login']); ?></a></strong>
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <h2><?php _e('Add user') ?></h2>
</span><del>- <form action="wpmu-edit.php?action=adduser" method="post">
</del><ins>+ <form action="ms-edit.php?action=adduser" method="post">
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope='row'><?php _e('Username') ?></th>
</span></span></pre>
</div>
</div>
</body>
</html>