Make WordPress Core


Ignore:
Timestamp:
08/27/2016 10:31:11 PM (8 years ago)
Author:
wonderboymusic
Message:

Bootstrap: after r38409 and r38410, revert r38402 which reverted r38399.

This fixes the paths in wp-vendor/ that were including src. I want to drop this in so we can find out what else will break.

See #36335.

File:
1 edited

Legend:

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

    r38402 r38411  
    2424    global $wp_admin_bar;
    2525
    26     if ( ! is_admin_bar_showing() )
     26    if ( ! is_admin_bar_showing() ) {
    2727        return false;
    28 
    29     /* Load the admin bar class code ready for instantiation */
    30     require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
     28    }
    3129
    3230    /* Instantiate the admin bar */
     
    4038     */
    4139    $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
    42     if ( class_exists( $admin_bar_class ) )
     40    if ( class_exists( $admin_bar_class ) ) {
    4341        $wp_admin_bar = new $admin_bar_class;
    44     else
     42    } else {
    4543        return false;
    46 
     44    }
    4745    $wp_admin_bar->initialize();
    4846    $wp_admin_bar->add_menus();
     
    295293
    296294    if ( is_network_admin() ) {
    297         /* translators: %s: site name */ 
     295        /* translators: %s: site name */
    298296        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
    299297    } elseif ( is_user_admin() ) {
    300         /* translators: %s: site name */ 
     298        /* translators: %s: site name */
    301299        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
    302300    }
Note: See TracChangeset for help on using the changeset viewer.