Changeset 22800

Timestamp:

11/21/12 22:39:59 (17 months ago)

Author:

dd32

Message:

Correct get_home_path() for cases where WordPress is installed in a subdirectory called /wp/, previously it would match on /wp-admin instead of /wp causing an incorrect return path. Props SergeyBiryukov. Fixes #20449

File:

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

trunk/wp-admin/includes/file.php

@@ -84 +84 @@
     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);
+        $pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) );
         $home_path = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
         $home_path = trailingslashit( $home_path );