Ticket #16953: 16953.5.diff

wp-includes/functions.php

@@ -1429 +1429 @@
 }
 
 /**
+ * Normalize a filesystem path
+ *
+ * Replaces backslashes with forward slashes for Windows systems, and ensures
+ * no duplicate slashes exist.
+ *
+ * @param string $path Path to normalize
+ * @return string Normalized path
+ */
+function wp_normalize_path( $path ) {
+        $path = str_replace( '\\', '/', $file );
+        $path = preg_replace( '|/+|','/', $file );
+        return $path;
+}
+
+/**
  * Determines a writable directory for temporary files.
  * Function's preference is the return value of <code>sys_get_temp_dir()</code>,
  * followed by your PHP temporary upload directory, followed by WP_CONTENT_DIR,

wp-includes/plugin.php

@@ -574 +574 @@
  * @uses WP_PLUGIN_DIR
  */
 function plugin_basename($file) {
-        $file = str_replace('\\','/',$file); // sanitize for Win32 installs
-        $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
-        $plugin_dir = str_replace('\\','/',WP_PLUGIN_DIR); // sanitize for Win32 installs
-        $plugin_dir = preg_replace('|/+|','/', $plugin_dir); // remove any duplicate slash
-        $mu_plugin_dir = str_replace('\\','/',WPMU_PLUGIN_DIR); // sanitize for Win32 installs
-        $mu_plugin_dir = preg_replace('|/+|','/', $mu_plugin_dir); // remove any duplicate slash
+        global $wp_plugin_paths;
+        $original_file = $file;
+
+        foreach ($wp_plugin_paths as $dir => $realdir) {
+                if (strpos($file, $realdir) === 0) {
+                        $file = $dir . substr( $file, strlen( $realdir ) );
+                }
+        }
+
+        $file = wp_normalize_path($file);
+        $plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
+        $mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+
         $file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir
         $file = trim($file, '/');
-        return $file;
+
+        /**
+         * Filter the plugin's basename.
+         *
+         * @since 3.7.0
+         *
+         * @param string $file Resolved basename.
+         * @param string $original_file Filename passed into the function.
+         */
+        return apply_filters( 'plugin_basename', $file, $original_file );
 }
 
 /**

wp-settings.php

@@ -194 +194 @@
 register_theme_directory( get_theme_root() );
 
 // Load active plugins.
-foreach ( wp_get_active_and_valid_plugins() as $plugin )
+$wp_plugin_paths = array();
+foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
+        $plugin_path = wp_normalize_path( dirname( $plugin ) );
+        $plugin_realpath = wp_normalize_path( dirname( realpath( $plugin ) ) );
+
+        if ( $plugin_path !== $plugin_realpath ) {
+                $wp_plugin_paths[ $plugin_path ] = $plugin_realpath;
+        }
+
         include_once( $plugin );
-unset( $plugin );
+}
+unset( $plugin, $plugin_path, $plugin_realpath );
 
 // Load pluggable functions.
 require( ABSPATH . WPINC . '/pluggable.php' );