Changeset 8443 for trunk/src/bp-members/bp-members-admin.php

Timestamp:

05/22/2014 06:31:21 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Add missing $notice to suppress debug notices. Remove trailing whitespace and a few more code-clean-up bits. Props imath. See #5623.

File:

• trunk/src/bp-members/bp-members-admin.php (modified) (13 diffs)

trunk/src/bp-members/bp-members-admin.php

@@ -115 +115 @@
 
         // The current user id
-        $this->current_user_id = get_current_user_id(); 
+        $this->current_user_id = get_current_user_id();
 
         // The user id being edited
@@ -205 +205 @@
      *
      * Look for $_GET['user_id']. If anything else, force the user ID to the
-     * current user's ID so they aren't left without a user to edit. 
+     * current user's ID so they aren't left without a user to edit.
      *
      * @since BuddyPress (2.1.0)
@@ -230 +230 @@
     /**
      * Can the current user edit the one displayed
-     * 
+     *
      * self profile editing / or bp_moderate check.
      * This might be replaced by more granular capabilities
@@ -267 +267 @@
     private function get_user_notice() {
 
+        // Setup empty notice for return value
+        $notice = array();
+
+        // Updates
         if ( ! empty( $_REQUEST['updated'] ) ) {
             switch ( $_REQUEST['updated'] ) {
@@ -296 +300 @@
         }
 
+        // Errors
         if ( ! empty( $_REQUEST['error'] ) ) {
             switch ( $_REQUEST['error'] ) {
@@ -451 +456 @@
         foreach ( $page_head as $head ) {
             add_action( "admin_head-{$head}", array( $this, 'profile_admin_head' ) );
-        }       
+        }
     }
 
@@ -763 +768 @@
 
         // Construct URL for form
-        $form_url        = remove_query_arg( array( 'action', 'error', 'updated', 'spam', 'ham' ), $_SERVER['REQUEST_URI'] );
-        $form_url        = add_query_arg( 'action', 'update', $form_url );
+        $request_url     = remove_query_arg( array( 'action', 'error', 'updated', 'spam', 'ham' ), $_SERVER['REQUEST_URI'] );
+        $form_action_url = add_query_arg( 'action', 'update', $request_url );
         $wp_http_referer = false;
         if ( ! empty( $_REQUEST['wp_http_referer'] ) ) {
@@ -812 +817 @@
                 $this->profile_nav( $user, 'BuddyPress' ); ?>
 
-                <form action="<?php echo esc_url( $form_url ); ?>" id="your-profile" method="post">
+                <form action="<?php echo esc_url( $form_action_url ); ?>" id="your-profile" method="post">
                     <div id="poststuff">
 
@@ -1044 +1049 @@
     /**
      * Add a filter to edit profile url in WP Admin Bar
-     * 
+     *
      * @access public
      * @since BuddyPress (2.1.0)
@@ -1054 +1059 @@
     /**
      * Filter the profile url
-     * 
+     *
      * @access public
      * @since BuddyPress (2.1.0)
-     * 
+     *
      * @uses  user_admin_url()
      */
@@ -1069 +1074 @@
     /**
      * Remove the filter to edit profile url in WP Admin Bar
-     * 
+     *
      * @access public
      * @since BuddyPress (2.1.0)
@@ -1387 +1392 @@
         $notice = array();
 
-        // Updated
+        // Updates
         if ( ! empty( $_REQUEST['updated'] ) ) {
             switch ( $_REQUEST['updated'] ) {
@@ -1494 +1499 @@
         }
 
-        // Process error messages
+        // Errors
         if ( ! empty( $_REQUEST['error'] ) ) {
             switch ( $_REQUEST['error'] ) {