Changeset 21224

Timestamp:

07/06/2012 01:54:15 PM (13 years ago)

Author:

dd32

Message:

Make get_home_path() work in more cases by being case insensitive and sanitzing Windows paths. In some cases (such as differing case of hostnames or paths in the site/home options, or when SCRIPT_FILENAME contains forward slashes) the function was failing to return the correct path, and would instead return /. Props to SergeyBiryukov for the initial patch. Fixes #20449 Fixes #10447

File:

• trunk/wp-admin/includes/file.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -80 +80 @@
     $home = get_option( 'home' );
     $siteurl = get_option( 'siteurl' );
-    if ( $home != '' && $home != $siteurl ) {
-        $wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */
-        $pos = strrpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
-        $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);
+    if ( ! empty( $home ) && 0 !== strcasecmp( $home, $siteurl ) ) {
+        $wp_path_rel_to_home = str_ireplace( $home, '', $siteurl ); /* $siteurl - $home */
+        $pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), $wp_path_rel_to_home);
+        $home_path = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
         $home_path = trailingslashit( $home_path );
     } else {