Changeset 18700 for trunk/wp-includes/admin-bar.php

Timestamp:

09/17/2011 10:26:01 PM (13 years ago)

Author:

nacin

Message:

Force the admin bar on in the admin as it is now integrated. Removes the second UI option. Leaves out the upgrade routine for now. see #18197.

File:

• trunk/wp-includes/admin-bar.php (modified) (3 diffs)

trunk/wp-includes/admin-bar.php

@@ -541 +541 @@
     global $show_admin_bar, $pagenow;
 
-    /* For all these types of request we never want an admin bar period */
+    // For all these types of requests, we never want an admin bar.
     if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
         return false;
+
+    // Integrated into the admin.
+    if ( is_admin() )
+        return true;
 
     if ( ! isset( $show_admin_bar ) ) {
@@ -549 +553 @@
             $show_admin_bar = false;
         } else {
-            $context = is_admin() ? 'admin' : 'front';
-            $show_admin_bar = _get_admin_bar_pref( $context );
+            $show_admin_bar = _get_admin_bar_pref();
         }
     }
@@ -560 +563 @@
 
 /**
- * Retrieve the admin bar display preference of a user based on context.
+ * Retrieve the admin bar display preference of a user.
  *
  * @since 3.1.0
  * @access private
  *
- * @param string $context Context of this preference check, either 'admin' or 'front'.
+ * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'
+ *  preference is no longer used.
  * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
  * @return bool Whether the admin bar should be showing for this user.
  */
-function _get_admin_bar_pref( $context, $user = 0 ) {
+function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
     $pref = get_user_option( "show_admin_bar_{$context}", $user );
     if ( false === $pref )