Changeset 7271 for trunk/bp-xprofile/bp-xprofile-classes.php

Timestamp:

07/11/2013 05:28:38 PM (12 years ago)

Author:

johnjamesjacoby

Message:

In XProfile admin, replace admin.php links with users.php. Fixes regression from 1.6 when profile fields were moved out of Settings and into Users, causing the "Profile Fields" menu item to not appear currently selected. See #5094.

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (6 diffs)

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -353 +353 @@
         if ( empty( $this->id ) ) {
             $title  = __( 'Add New Field Group', 'buddypress' );
-            $action = "admin.php?page=bp-profile-setup&mode=add_group";
+            $action = "users.php?page=bp-profile-setup&mode=add_group";
             $button = __( 'Create Field Group', 'buddypress' );
         } else {
             $title  = __( 'Edit Field Group', 'buddypress' );
-            $action = "admin.php?page=bp-profile-setup&mode=edit_group&group_id=" . $this->id;
+            $action = "users.php?page=bp-profile-setup&mode=edit_group&group_id=" . $this->id;
             $button = __( 'Save Changes', 'buddypress' );
         } ?>
@@ -404 +404 @@
                                             <div id="major-publishing-actions">
                                                 <div id="delete-action">
-                                                    <a href="admin.php?page=bp-profile-setup" class="submitdelete deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+                                                    <a href="users.php?page=bp-profile-setup" class="submitdelete deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
                                                 </div>
                                                 <div id="publishing-action">
@@ -785 +785 @@
                             <input type="<?php echo $default_input; ?>" name="isDefault_<?php echo esc_attr( $type ); ?>_option<?php echo esc_attr( $default_name ); ?>" <?php checked( (int) $options[$i]->is_default_option, true ); ?> value="<?php echo esc_attr( $j ); ?>" />
                             <span><?php _e( 'Default Value', 'buddypress' ); ?></span>
-                            <a href="<?php echo esc_url( 'admin.php?page=bp-profile-setup&amp;mode=delete_option&amp;option_id=' . $options[$i]->id ); ?>" class="ajax-option-delete" id="delete-<?php echo esc_attr( $options[$i]->id ); ?>">[x]</a>
+                            <a href="<?php echo esc_url( 'users.php?page=bp-profile-setup&amp;mode=delete_option&amp;option_id=' . $options[$i]->id ); ?>" class="ajax-option-delete" id="delete-<?php echo esc_attr( $options[$i]->id ); ?>">[x]</a>
                         </p>
 
@@ -817 +817 @@
         if ( empty( $this->id ) ) {
             $title  = __( 'Add Field', 'buddypress' );
-            $action = "admin.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field#tabs-" . $this->group_id;
+            $action = "users.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field#tabs-" . $this->group_id;
 
             if ( !empty( $_POST['saveField'] ) ) {
@@ -829 +829 @@
         } else {
             $title  = __( 'Edit Field', 'buddypress' );
-            $action = "admin.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id . "#tabs-" . $this->group_id;
+            $action = "users.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id . "#tabs-" . $this->group_id;
         } ?>
 
@@ -926 +926 @@
                         <input type="hidden" name="field_order" id="field_order" value="<?php echo esc_attr( $this->field_order ); ?>" />
                         <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" name="saveField" id="saveField" style="font-weight: bold" class="button-primary" />
-                        <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+                        <?php _e( 'or', 'buddypress' ); ?> <a href="users.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
                     </p>