Changeset 6700

Timestamp:

01/31/2008 10:03:48 PM (17 years ago)

Author:

ryan

Message:

Fix profile submenu highlight. Make is_profile_page a constant so that register globals can't manipulate it. see #5736

Location:

trunk/wp-admin

Files:

• profile-update.php (modified) (1 diff)
• profile.php (modified) (1 diff)
• user-edit.php (modified) (2 diffs)

trunk/wp-admin/profile-update.php

@@ -2 +2 @@
 
 require_once('admin.php');
-
-$parent_file = 'profile.php';
-$submenu_file = 'profile.php';
 
 check_admin_referer('update-profile_' . $user_ID);

trunk/wp-admin/profile.php

@@ -1 +1 @@
 <?php
-$is_profile_page = true;
+define('IS_PROFILE_PAGE', true);
 require_once('user-edit.php');
 ?>

trunk/wp-admin/user-edit.php

@@ -1 +1 @@
 <?php
-
-$is_profile_page = isset($is_profile_page) && $is_profile_page? true : false;
 
 require_once('admin.php');
+
+if ( defined('IS_PROFILE_PAGE') && IS_PROFILE_PAGE )
+    $is_profile_page = true;
+else
+    $is_profile_page = false;
 
 function profile_js ( ) {
@@ -53 +56 @@
 $title = $is_profile_page? __('Profile') : __('Edit User');
 if ( current_user_can('edit_users') && !$is_profile_page )
-    $parent_file = 'users.php';
+    $submenu_file = 'users.php';
 else
-    $parent_file = 'profile.php';
-$submenu_file = 'users.php';
+    $submenu_file = 'profile.php';
+$parent_file = 'users.php';
 
 wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer'));