Changeset 11808 for trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

Timestamp:

01/10/2018 09:34:15 PM (7 years ago)

Author:

johnjamesjacoby

Message:

XProfile: use bp_get_admin_url() where appropriate.

This change updates all inline and querystring-based URL references to users.php to instead use the built-in supplied wrapper function. This comes with a few benefits:

• URLs will be consistent across BuddyPress installation configurations (rather than relative to the current admin dashboard area)
• Code is cleaner and easier to understand
• Variable IDs are now cast to integers as needed (where they were not all previously)

Bonus: also updates a few bp_get_admin_url() calls in the about page to use the second parameter of add_query_arg() rather than wrapping it entirely, to match the expected usage format of all add_query_arg() calls.

Fixes #7536. Props JohnPBloch.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php (modified) (2 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -717 +717 @@
         global $message;
 
+        // Users Admin URL
+        $users_url = bp_get_admin_url( 'users.php' );
+
+        // URL to cancel to
+        $cancel_url = add_query_arg( array(
+            'page' => 'bp-profile-setup'
+        ), $users_url );
+
         // New field group.
         if ( empty( $this->id ) ) {
             $title  = __( 'Add New Field Group', 'buddypress' );
-            $action = add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'add_group' ), 'users.php' );
-            $button = __( 'Save', 'buddypress' );
+            $button = __( 'Save',                'buddypress' );
+            $action = add_query_arg( array(
+                'page' => 'bp-profile-setup',
+                'mode' => 'add_group'
+            ), $users_url );
 
         // Existing field group.
         } else {
             $title  = __( 'Edit Field Group', 'buddypress' );
-            $action = add_query_arg( array( 'page' => 'bp-profile-setup', 'mode' => 'edit_group', 'group_id' => $this->id ), 'users.php' );
-            $button = __( 'Update', 'buddypress' );
+            $button = __( 'Update',           'buddypress' );
+            $action = add_query_arg( array(
+                'page'     => 'bp-profile-setup',
+                'mode'     => 'edit_group',
+                'group_id' => (int) $this->id
+            ), $users_url );
         } ?>
 
@@ -814 +829 @@
                                             </div>
                                             <div id="delete-action">
-                                                <a href="users.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+                                                <a href="<?php echo esc_url( $cancel_url ); ?>" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
                                             </div>
                                             <div class="clear"></div>