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

Timestamp:

11/17/2010 06:47:34 PM (14 years ago)

Author:

ryan

Message:

Pinking shears

File:

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

trunk/wp-includes/admin-bar.php

@@ -5 +5 @@
  * This code handles the building and rendering of the press bar.
  */
- 
+
 /**
  * Instantiate the admin bar object and set it up as a global for access elsewhere.
@@ -23 +23 @@
     /* Instantiate the admin bar */
     $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-    if ( class_exists( $admin_bar_class ) ) 
+    if ( class_exists( $admin_bar_class ) )
         $wp_admin_bar = new $admin_bar_class;
     else
         return false;
-    
+
     $wp_admin_bar->initialize();
     $wp_admin_bar->add_menus();
@@ -61 +61 @@
 
     do_action( 'wp_after_admin_bar_render' );
-    
+
     $wp_admin_bar->unload_user_locale_translations();
 }
@@ -88 +88 @@
 
     $user_id = get_current_user_id();
-    
+
     if ( 0 != $user_id ) {
         /* Add the 'My Account' menu */
         $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity,  'href' => get_edit_profile_url( $user_id ) ) );
-    
+
         /* Add the "My Account" sub menus */
         $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) );
@@ -158 +158 @@
 /**
  * Provide a shortlink.
- * 
+ *
  * @since 3.1.0
  */
@@ -172 +172 @@
 /**
  * Provide an edit link for posts and terms.
- * 
+ *
  * @since 3.1.0
  */
@@ -198 +198 @@
         if ( $ptype_obj->show_in_menu !== true || ! current_user_can( $ptype_obj->cap->edit_posts ) )
             continue;
-            
+
         $actions["post-new.php?post_type=$ptype"] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, "new-$ptype" );
     }
@@ -260 +260 @@
         $wordpress_update_count = 1;
     */
- 
+
     $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
 
@@ -298 +298 @@
     ?>
     <style type="text/css">
-        <?php 
-        
-        if ( 
-            ( empty( $_GET['nobump'] ) || is_admin() ) && 
-            ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' ) 
-        ) : 
+        <?php
+
+        if (
+            ( empty( $_GET['nobump'] ) || is_admin() ) &&
+            ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' )
+        ) :
             ?>
             body { padding-top: 28px !important; }
-            <?php 
-        endif; 
+            <?php
+        endif;
 
         if ( in_array( get_current_theme(), array('H3', 'H4', 'The Journalist v1.9') ) ) :
@@ -329 +329 @@
 function is_admin_bar_showing() {
     global $show_admin_bar;
-    
+
     /* For all these types of request we never want an admin bar period */
     if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
         return false;
-    
+
     if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
         if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {