From 593eca6f21848f3415789f7a27681e42656aaa2b Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Fri, 27 Jul 2007 21:28:01 +0000 Subject: [PATCH] ABSPATH already has a trailing slash. Props Nazgul. fixes #4607 git-svn-id: https://develop.svn.wordpress.org/trunk@5820 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/admin-header.php | 4 ++-- wp-admin/admin.php | 6 +++--- wp-admin/import/mt.php | 4 ++-- wp-admin/includes/upgrade.php | 4 ++-- wp-admin/upgrade.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/template-loader.php | 4 ++-- wp-settings.php | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 9f84960f1b..6f9b46d1c6 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -49,9 +49,9 @@ do_action('admin_head');

%s.'), $user_identity) ?> [, ]

diff --git a/wp-admin/admin.php b/wp-admin/admin.php index ac4c801dfa..2248be4969 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -35,7 +35,7 @@ if (isset($_GET['page'])) { $plugin_page = plugin_basename($plugin_page); } -require(ABSPATH . '/wp-admin/menu.php'); +require(ABSPATH . 'wp-admin/menu.php'); // Handle plugin admin pages. if (isset($plugin_page)) { @@ -44,7 +44,7 @@ if (isset($plugin_page)) { if ( $page_hook ) { do_action('load-' . $page_hook); if (! isset($_GET['noheader'])) - require_once(ABSPATH . '/wp-admin/admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); do_action($page_hook); } else { @@ -58,7 +58,7 @@ if (isset($plugin_page)) { do_action('load-' . $plugin_page); if (! isset($_GET['noheader'])) - require_once(ABSPATH . '/wp-admin/admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); include(ABSPATH . PLUGINDIR . "/$plugin_page"); } diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 8ee9c39720..a2b690402d 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -177,7 +177,7 @@ class MT_Import { function select_authors() { if ( $_POST['upload_type'] === 'ftp' ) { - $file['file'] = ABSPATH . '/wp-content/mt-export.txt'; + $file['file'] = ABSPATH . 'wp-content/mt-export.txt'; if ( !file_exists($file['file']) ) $file['error'] = __('mt-export.txt does not exist'); } else { @@ -411,7 +411,7 @@ class MT_Import { function import() { $this->id = (int) $_GET['id']; if ( $this->id == 0 ) - $this->file = ABSPATH . '/wp-content/mt-export.txt'; + $this->file = ABSPATH . 'wp-content/mt-export.txt'; else $this->file = get_attached_file($this->id); $this->get_authors_from_post(); diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 8db4c9d6de..e51b0e4288 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -2,8 +2,8 @@ if ( file_exists(ABSPATH . 'wp-content/install.php') ) require (ABSPATH . 'wp-content/install.php'); -require_once(ABSPATH . '/wp-admin/includes/admin.php'); -require_once(ABSPATH . '/wp-admin/includes/schema.php'); +require_once(ABSPATH . 'wp-admin/includes/admin.php'); +require_once(ABSPATH . 'wp-admin/includes/schema.php'); if ( !function_exists('wp_install') ) : function wp_install($blog_title, $user_name, $user_email, $public, $meta='') { diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index d2f30c4ec1..f367f03b98 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -5,7 +5,7 @@ if (!file_exists('../wp-config.php')) require('../wp-config.php'); timer_start(); -require_once(ABSPATH . '/wp-admin/includes/upgrade.php'); +require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); if (isset($_GET['step'])) $step = (int) $_GET['step']; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 6a9123e0dd..150a10a88f 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -485,7 +485,7 @@ function do_enclose( $content, $post_ID ) { global $wp_version, $wpdb; include_once (ABSPATH . WPINC . '/class-IXR.php'); - $log = debug_fopen(ABSPATH . '/enclosures.log', 'a'); + $log = debug_fopen(ABSPATH . 'enclosures.log', 'a'); $post_links = array(); debug_fwrite($log, 'BEGIN '.date('YmdHis', time())."\n"); diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php index 80ba5dc339..0c5a671c87 100644 --- a/wp-includes/template-loader.php +++ b/wp-includes/template-loader.php @@ -8,7 +8,7 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { do_feed(); return; } else if ( is_trackback() ) { - include(ABSPATH . '/wp-trackback.php'); + include(ABSPATH . 'wp-trackback.php'); return; } else if ( is_404() && $template = get_404_template() ) { include($template); @@ -68,7 +68,7 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { do_feed(); return; } else if ( is_trackback() ) { - include(ABSPATH . '/wp-trackback.php'); + include(ABSPATH . 'wp-trackback.php'); return; } } diff --git a/wp-settings.php b/wp-settings.php index e73c1fd4f0..e23c2d0188 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -196,8 +196,8 @@ require (ABSPATH . WPINC . '/vars.php'); // Check for hacks file if the option is enabled if (get_option('hack_file')) { - if (file_exists(ABSPATH . '/my-hacks.php')) - require(ABSPATH . '/my-hacks.php'); + if (file_exists(ABSPATH . 'my-hacks.php')) + require(ABSPATH . 'my-hacks.php'); } if ( get_option('active_plugins') ) {