From 244216d6172ed2a9a520654be1811e62dcec0cd2 Mon Sep 17 00:00:00 2001 From: nacin Date: Sat, 30 Oct 2010 06:40:04 +0000 Subject: [PATCH] Kill the admin-bar directory. see #14772. git-svn-id: http://svn.automattic.com/wordpress/trunk@16098 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/admin-bar.php | 2 +- .../{admin-bar/admin-bar-class.php => class-wp-admin-bar.php} | 2 +- .../{admin-bar/admin-bar-superadmin.php => ms-admin-bar.php} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename wp-includes/{admin-bar/admin-bar-class.php => class-wp-admin-bar.php} (99%) rename wp-includes/{admin-bar/admin-bar-superadmin.php => ms-admin-bar.php} (100%) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index deec56a5d..796d91fad 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -18,7 +18,7 @@ function wp_admin_bar_init() { return false; /* Load the admin bar class code ready for instantiation */ - require( ABSPATH . WPINC . '/admin-bar/admin-bar-class.php' ); + require( ABSPATH . WPINC . '/class-wp-admin-bar.php' ); /* Instantiate the admin bar */ $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' ); diff --git a/wp-includes/admin-bar/admin-bar-class.php b/wp-includes/class-wp-admin-bar.php similarity index 99% rename from wp-includes/admin-bar/admin-bar-class.php rename to wp-includes/class-wp-admin-bar.php index ec4b5d98b..7debb9672 100644 --- a/wp-includes/admin-bar/admin-bar-class.php +++ b/wp-includes/class-wp-admin-bar.php @@ -9,7 +9,7 @@ class WP_Admin_Bar { function initialize() { /* Only load super admin menu code if the logged in user is a super admin */ if ( is_super_admin() ) { - require( ABSPATH . WPINC . '/admin-bar/admin-bar-superadmin.php' ); + require( ABSPATH . WPINC . '/ms-admin-bar.php' ); } /* Set the protocol used throughout this code */ diff --git a/wp-includes/admin-bar/admin-bar-superadmin.php b/wp-includes/ms-admin-bar.php similarity index 100% rename from wp-includes/admin-bar/admin-bar-superadmin.php rename to wp-includes/ms-admin-bar.php