Ticket #25726: 25726.diff

Index: src/wp-includes/ms-default-filters.php
===================================================================
--- src/wp-includes/ms-default-filters.php      (revision 25946)
+++ src/wp-includes/ms-default-filters.php      (working copy)
@@ -62,6 +62,11 @@
 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.
+       /**
+        * The multisite constant EDIT_ANY_USER turns into filter.
+        *
+        * @since 3.0
+        */
        add_filter( 'enable_edit_any_user_configuration', '__return_false' );
 add_filter( 'force_filtered_html_on_import', '__return_true' );
Index: src/wp-admin/user-new.php
===================================================================
--- src/wp-admin/user-new.php   (revision 25946)
+++ src/wp-admin/user-new.php   (working copy)
@@ -377,13 +377,7 @@
                <td><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
        </tr>
 <?php
-/**
- * Filter the display of the password fields.
- *
- * @since 1.5.1
- *
- * @param bool True or false, based on if you want to show the password fields. Default is true.
- */
+/** This filter is documented in wp-admin/user-edit.php */
 if ( apply_filters( 'show_password_fields', true ) ) : ?>
        <tr class="form-field form-required">
                <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
Index: src/wp-admin/user-edit.php
===================================================================
--- src/wp-admin/user-edit.php  (revision 25946)
+++ src/wp-admin/user-edit.php  (working copy)
@@ -75,7 +75,9 @@
 }
 
 // Only allow super admins on multisite to edit every user.
-if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) )
+if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID 
+       /** Filter is documented in wp-admin/user-edit.php */
+       && ! apply_filters( 'enable_edit_any_user_configuration', true ) )
        wp_die( __( 'You do not have permission to edit this user.' ) );
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
@@ -353,7 +355,18 @@
        foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
 ?>
 <tr>
-       <th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
+       <th><label for="<?php echo $name; ?>">
+               <?php
+               /**
+                * This filter allows adding and removing contact methods from user profiles.
+                * 
+                * @since 2.9.0
+                *
+                * @param string $desc - the description of the contact method 
+                */
+               echo apply_filters('user_'.$name.'_label', $desc); 
+               ?>
+       </label></th>
        <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
 </tr>
 <?php
@@ -371,6 +384,14 @@
 </tr>
 
 <?php
+/**
+ * Filter the display of the password fields.
+ *
+ * @since 1.5.1
+ *
+ * @param bool True or false, based on if you want to show the password fields. Default is true.
+ * @param WP_User, the current user.
+ */
 $show_password_fields = apply_filters('show_password_fields', true, $profileuser);
 if ( $show_password_fields ) :
 ?>
@@ -392,7 +413,6 @@
 </tr>
 <?php endif; ?>
 </table>
-
 <?php
        if ( IS_PROFILE_PAGE )
                do_action( 'show_user_profile', $profileuser );
@@ -400,7 +420,17 @@
                do_action( 'edit_user_profile', $profileuser );
 ?>
 
-<?php if ( count( $profileuser->caps ) > count( $profileuser->roles ) && apply_filters( 'additional_capabilities_display', true, $profileuser ) ) : ?>
+<?php 
+/** 
+ * Allows plugins to overwrite the display of 
+ * "Additional Capabilities" section in user accounts.
+ *
+ * @since 2.8.0
+ *
+ * @param bool True or false, whether or not to overwrite. Default is true.
+ * @param WP_User, the current user.
+ */
+if ( count( $profileuser->caps ) > count( $profileuser->roles ) && apply_filters( 'additional_capabilities_display', true, $profileuser ) ) : ?>
 <h3><?php _e( 'Additional Capabilities' ); ?></h3>
 <table class="form-table">
 <tr>