From 12de05107e4c8b006bde6ee8916f34eb476d08da Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 13 Jun 2008 17:21:00 +0000 Subject: WP Merge with revision 8075 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/admin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wp-admin/admin.php') diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 1385e87..e9591e8 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -2,9 +2,9 @@ define('WP_ADMIN', TRUE); if ( defined('ABSPATH') ) - require_once( ABSPATH . 'wp-config.php'); + require_once(ABSPATH . 'wp-load.php'); else - require_once('../wp-config.php'); + require_once('../wp-load.php'); if ( get_option('db_version') != $wp_db_version ) { require_once('../wp-includes/class-snoopy.php'); @@ -27,8 +27,8 @@ $time_format = get_option('time_format'); wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback')); -wp_admin_css_color('classic', __('Classic'), get_option( 'siteurl' ) . "/wp-admin/css/colors-classic.css", array('#07273E', '#14568A', '#D54E21', '#2683AE')); -wp_admin_css_color('fresh', __('Fresh'), get_option( 'siteurl' ) . "/wp-admin/css/colors-fresh.css", array('#464646', '#CEE1EF', '#D54E21', '#2683AE')); +wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE')); +wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE')); wp_enqueue_script( 'common' ); wp_enqueue_script( 'jquery-color' ); -- cgit