Ticket #4607: 4607.diff

wp-admin/admin-header.php

@@ -49 +49 @@
 <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');
 }
 ?>

wp-admin/admin.php

@@ -35 +35 @@
         $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 +44 @@
         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 +58 @@
                 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");
         }

wp-admin/import/mt.php

@@ -177 +177 @@
 
         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 +411 @@
         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();

wp-admin/includes/upgrade.php

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

wp-admin/upgrade.php

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

wp-includes/functions.php

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

wp-includes/template-loader.php

@@ -8 +8 @@
                 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 +68 @@
                 do_feed();
                 return;
         } else if ( is_trackback() ) {
-                include(ABSPATH . '/wp-trackback.php');
+                include(ABSPATH . 'wp-trackback.php');
                 return;
         }
 }

wp-settings.php

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