Changeset 5820

Timestamp:

07/27/2007 09:28:01 PM (17 years ago)

Author:

markjaquith

Message:

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

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/admin.php (modified) (3 diffs)
• wp-admin/import/mt.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/upgrade.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/template-loader.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

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

trunk/wp-admin/admin.php

@@ -36 +36 @@
 }
 
-require(ABSPATH . '/wp-admin/menu.php');
+require(ABSPATH . 'wp-admin/menu.php');
 
 // Handle plugin admin pages.
@@ -45 +45 @@
         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);
@@ -59 +59 @@
 
         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");

trunk/wp-admin/import/mt.php

@@ -178 +178 @@
     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>');
@@ -412 +412 @@
         $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);

trunk/wp-admin/includes/upgrade.php

@@ -3 +3 @@
 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') ) :

trunk/wp-admin/upgrade.php

@@ -6 +6 @@
 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']))

trunk/wp-includes/functions.php

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

trunk/wp-includes/template-loader.php

@@ -9 +9 @@
         return;
     } else if ( is_trackback() ) {
-        include(ABSPATH . '/wp-trackback.php');
+        include(ABSPATH . 'wp-trackback.php');
         return;
     } else if ( is_404() && $template = get_404_template() ) {
@@ -69 +69 @@
         return;
     } else if ( is_trackback() ) {
-        include(ABSPATH . '/wp-trackback.php');
+        include(ABSPATH . 'wp-trackback.php');
         return;
     }

trunk/wp-settings.php

@@ -197 +197 @@
 // 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');
 }