<!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>[13568] trunk: Switch the multisite constant EDIT_ANY_USER to a filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13568">13568</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-03 07:04:25 +0000 (Wed, 03 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch the multisite constant EDIT_ANY_USER to a filter. Also ensure we're back compat with POST_BY_EMAIL. see <a href="http://trac.wordpress.org/ticket/12381">#12381</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeswpconfigms">trunk/wp-admin/includes/wp-config.ms</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeswpconfigms"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/wp-config.ms (13567 => 13568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/wp-config.ms 2010-03-03 06:41:19 UTC (rev 13567)
+++ trunk/wp-admin/includes/wp-config.ms 2010-03-03 07:04:25 UTC (rev 13568)
</span><span class="lines">@@ -41,11 +41,6 @@
</span><span class="cx"> define('SITE_ID_CURRENT_SITE', 1);
</span><span class="cx"> define('BLOGID_CURRENT_SITE', '1' );
</span><span class="cx">
</span><del>-/* Uncomment to allow blog admins to edit their users. See http://trac.mu.wordpress.org/ticket/1169 */
-//define( "EDIT_ANY_USER", true );
-/* Uncomment to enable post by email options. See http://trac.mu.wordpress.org/ticket/1084 */
-//define( "POST_BY_EMAIL", true );
-
</del><span class="cx"> /**#@+
</span><span class="cx"> * Authentication Unique Keys.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (13567 => 13568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-03-03 06:41:19 UTC (rev 13567)
+++ trunk/wp-admin/user-edit.php 2010-03-03 07:04:25 UTC (rev 13568)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-// Only allow site admins to edit every user.
-if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID )
</del><ins>+// Only allow super admins on multisite to edit every user.
+if ( is_multisite() && ! is_super_admin() && $user_id != $current_user->ID && apply_filters( 'enable_edit_any_user_configuration', true ) )
</ins><span class="cx"> wp_die( __( 'You do not have permission to edit this user.' ) );
</span><span class="cx">
</span><span class="cx"> // Execute confirmed email change. See send_confirmation_on_profile_email().
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-filters.php (13567 => 13568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-filters.php 2010-03-03 06:41:19 UTC (rev 13567)
+++ trunk/wp-includes/ms-default-filters.php 2010-03-03 07:04:25 UTC (rev 13568)
</span><span class="lines">@@ -1,43 +1,58 @@
</span><span class="cx"> <?php
</span><ins>+/**
+ * Sets up the default filters and actions for Multisite.
+ *
+ * If you need to remove a default hook, this file will give you the priority
+ * for which to use to remove the hook.
+ *
+ * Not all of the Multisite default hooks are found in ms-default-filters.php
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @see default-filters.php
+ */
+
</ins><span class="cx"> // Users
</span><del>-add_filter ( 'wpmu_validate_user_signup', 'signup_nonce_check' );
-add_action ( 'init', 'maybe_add_existing_user_to_blog' );
-add_action ( 'wpmu_new_user', 'newuser_notify_siteadmin' );
-add_action ( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
-add_action ( 'sanitize_user', 'strtolower' );
</del><ins>+add_filter( 'wpmu_validate_user_signup', 'signup_nonce_check' );
+add_action( 'init', 'maybe_add_existing_user_to_blog' );
+add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' );
+add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
+add_action( 'sanitize_user', 'strtolower' );
</ins><span class="cx">
</span><span class="cx"> // Blogs
</span><del>-add_filter ( 'wpmu_validate_blog_signup', 'signup_nonce_check' );
-add_action ( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 );
-add_action ( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 );
</del><ins>+add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' );
+add_action( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 );
+add_action( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 );
</ins><span class="cx">
</span><span class="cx"> // Register Nonce
</span><del>-add_action ( 'signup_hidden_fields', 'signup_nonce_fields' );
</del><ins>+add_action( 'signup_hidden_fields', 'signup_nonce_fields' );
</ins><span class="cx">
</span><span class="cx"> // Template
</span><del>-add_action ( 'template_redirect', 'maybe_redirect_404' );
-add_filter ( 'allowed_redirect_hosts', 'redirect_this_site' );
</del><ins>+add_action( 'template_redirect', 'maybe_redirect_404' );
+add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );
</ins><span class="cx">
</span><span class="cx"> // Administration
</span><del>-add_filter ( 'term_id_filter', 'global_terms', 10, 2 );
-add_action ( 'publish_post', 'update_posts_count' );
-add_action ( 'delete_post', 'wpmu_update_blogs_date' );
-add_action ( 'private_to_published', 'wpmu_update_blogs_date' );
-add_action ( 'publish_phone', 'wpmu_update_blogs_date' );
-add_action ( 'publish_post', 'wpmu_update_blogs_date' );
</del><ins>+add_filter( 'term_id_filter', 'global_terms', 10, 2 );
+add_action( 'publish_post', 'update_posts_count' );
+add_action( 'delete_post', 'wpmu_update_blogs_date' );
+add_action( 'private_to_published', 'wpmu_update_blogs_date' );
+add_action( 'publish_phone', 'wpmu_update_blogs_date' );
+add_action( 'publish_post', 'wpmu_update_blogs_date' );
</ins><span class="cx">
</span><span class="cx"> // Files
</span><del>-add_filter ( 'wp_upload_bits', 'upload_is_file_too_big' );
-add_filter ( 'import_upload_size_limit', 'fix_import_form_size' );
-add_filter ( 'upload_mimes', 'check_upload_mimes' );
</del><ins>+add_filter( 'wp_upload_bits', 'upload_is_file_too_big' );
+add_filter( 'import_upload_size_limit', 'fix_import_form_size' );
+add_filter( 'upload_mimes', 'check_upload_mimes' );
+add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
</ins><span class="cx">
</span><span class="cx"> // Mail
</span><del>-add_filter ( 'wp_mail_from', 'wordpressmu_wp_mail_from' );
-
-
</del><ins>+add_filter( 'wp_mail_from', 'wordpressmu_wp_mail_from' );
</ins><span class="cx"> add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
</span><span class="cx">
</span><span class="cx"> // Disable somethings by default for multisite
</span><span class="cx"> add_filter( 'enable_update_services_configuration', '__return_false' );
</span><del>-add_filter( 'enable_post_by_email_configuration', '__return_false' );
</del><ins>+if ( ! defined('POST_BY_EMAIL') || ! POST_BY_EMAIL ) // back compat constant.
+ add_filter( 'enable_post_by_email_configuration', '__return_false' );
+if ( ! defined('EDIT_ANY_USER') || ! EDIT_ANY_USER ) // back compat constant.
+ add_filter( 'enable_edit_any_user_configuration', '__return_false' );
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>