WordPress.org

Make WordPress Core


Ignore:
Timestamp:
08/27/2016 02:36:42 PM (5 years ago)
Author:
dd32
Message:

Bootstrap: Revert [38399] as it's broken /build/ and subsequently core.svn.wordpress.org.

The generated classmaps reference /src/ files and operates in the assumption that the base directory is one level above wp-settings.php, which it isn't after our build processes are run.

See #36335

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/admin-bar.php

    r38399 r38402  
    2424    global $wp_admin_bar;
    2525
    26     if ( ! is_admin_bar_showing() ) {
     26    if ( ! is_admin_bar_showing() )
    2727        return false;
    28     }
     28
     29    /* Load the admin bar class code ready for instantiation */
     30    require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
    2931
    3032    /* Instantiate the admin bar */
     
    3840     */
    3941    $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
    40     if ( class_exists( $admin_bar_class ) ) {
     42    if ( class_exists( $admin_bar_class ) )
    4143        $wp_admin_bar = new $admin_bar_class;
    42     } else {
     44    else
    4345        return false;
    44     }
     46
    4547    $wp_admin_bar->initialize();
    4648    $wp_admin_bar->add_menus();
     
    293295
    294296    if ( is_network_admin() ) {
    295         /* translators: %s: site name */
     297        /* translators: %s: site name */ 
    296298        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
    297299    } elseif ( is_user_admin() ) {
    298         /* translators: %s: site name */
     300        /* translators: %s: site name */ 
    299301        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
    300302    }
Note: See TracChangeset for help on using the changeset viewer.