Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ABSPATH already has a trailing slash. Props Nazgul. fixes #4607 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5820 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-07-27 21:28:01 +00:00
parent 343cbb9421
commit 764f50bd3d
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/admin-header.php
View File

@ -49,9 +49,9 @@ do_action('admin_head');
<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div>
<?php
require(ABSPATH . '/wp-admin/menu-header.php');
require(ABSPATH . 'wp-admin/menu-header.php');
if ( $parent_file == 'options-general.php' ) {
require(ABSPATH . '/wp-admin/options-head.php');
require(ABSPATH . 'wp-admin/options-head.php');
}
?>

6
wp-admin/admin.php
View File

@ -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");
}

4
wp-admin/import/mt.php
View File

@ -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'] = __('<code>mt-export.txt</code> does not exist</code>');
} 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();

4
wp-admin/includes/upgrade.php
View File

@ -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='') {

2
wp-admin/upgrade.php
View File

@ -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'];

2
wp-includes/functions.php
View File

@ -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");

4
wp-includes/template-loader.php
View File

@ -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;
}
}

4
wp-settings.php
View File

@ -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') ) {