Ticket #16953: 16953.8.diff

trunk/wp-includes/plugin.php

@@ -583 +583 @@
  * @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 );
+}
+
+/**
+ * Register a plugin's real path.
+ *
+ * This is used in {@see plugin_basename()} to resolve symlinked paths.
+ *
+ * @param string $file Known path to the file.
+ */
+function wp_register_plugin_realpath( $file ) {
+        global $wp_plugin_paths;
+
+        $plugin_path = wp_normalize_path( dirname( $file ) );
+        $plugin_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
+
+        if ( $plugin_path !== $plugin_realpath ) {
+                $wp_plugin_paths[ $plugin_path ] = $plugin_realpath;
+        }
 }
 
 /**

trunk/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( '\\', '/', $path );
+        $path = preg_replace( '|/+|','/', $path );
+        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,

trunk/wp-admin/includes/plugin.php

@@ -537 +537 @@
                 if ( !empty($redirect) )
                         wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
                 ob_start();
-                include_once(WP_PLUGIN_DIR . '/' . $plugin);
+                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+                include_once( WP_PLUGIN_DIR . '/' . $plugin );
 
                 if ( ! $silent ) {
                         /**
                          * Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
-                         * 
+                         *
                          * @since 2.9.0
                          *
                          * @param string $plugin       Plugin path to main plugin file with plugin data.
@@ -553 +554 @@
 
                         /**
                          * Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
-                         * 
+                         *
                          * The action concatenates the 'activate_' prefix with the $plugin value passed to
                          * activate_plugin() to create a dynamically-named action.
-                         * 
+                         *
                          * @since 2.0.0
                          *
                          * @param bool $network_wide Whether to enable the plugin for all sites in the network
@@ -577 +578 @@
                 if ( ! $silent ) {
                         /**
                          * Fires after a plugin has been activated in activate_plugin() when the $silent parameter is false.
-                         * 
+                         *
                          * @since 2.9.0
                          *
                          * @param string $plugin       Plugin path to main plugin file with plugin data.
@@ -627 +628 @@
                         /**
                          * Fires for each plugin being deactivated in deactivate_plugins(), before deactivation
                          * and when the $silent parameter is false.
-                         * 
+                         *
                          * @since 2.9.0
                          *
                          * @param string $plugin               Plugin path to main plugin file with plugin data.
-                         * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network 
+                         * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
                          *                                     or just the current site. Multisite only. Default is false.
                          */
                         do_action( 'deactivate_plugin', $plugin, $network_deactivating );
@@ -657 +658 @@
                         /**
                          * Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
                          * and when the $silent parameter is false.
-                         * 
+                         *
                          * The action concatenates the 'deactivate_' prefix with the plugin's basename
                          * to create a dynamically-named action.
-                         * 
+                         *
                          * @since 2.0.0
                          *
-                         * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network 
+                         * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
                          *                                   or just the current site. Multisite only. Default is false.
                          */
                         do_action( 'deactivate_' . $plugin, $network_deactivating );
@@ -671 +672 @@
                         /**
                          * Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
                          * and when the $silent parameter is false.
-                         * 
+                         *
                          * @since 2.9.0
                          *
                          * @param string $plugin               Plugin path to main plugin file with plugin data.
-                         * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network 
+                         * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
                          *                                     or just the current site. Multisite only. Default is false.
                          */
                         do_action( 'deactivated_plugin', $plugin, $network_deactivating );
@@ -914 +915 @@
                 unset($uninstallable_plugins);
 
                 define('WP_UNINSTALL_PLUGIN', $file);
+                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . dirname( $file ) );
                 include WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php';
 
                 return true;
@@ -925 +927 @@
                 update_option('uninstall_plugins', $uninstallable_plugins);
                 unset($uninstallable_plugins);
 
+                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
                 include WP_PLUGIN_DIR . '/' . $file;
 
                 add_action( 'uninstall_' . $file, $callable );
 
                 /**
                  * Fires in uninstall_plugin() once the plugin has been uninstalled.
-                 * 
+                 *
                  * The action concatenates the 'uninstall_' prefix with the basename of the
                  * plugin passed to {@see uninstall_plugin()} to create a dynamically-named action.
                  *

trunk/wp-settings.php

@@ -194 +194 @@
 register_theme_directory( get_theme_root() );
 
 // Load active plugins.
-foreach ( wp_get_active_and_valid_plugins() as $plugin )
+$GLOBALS['wp_plugin_paths'] = array();
+foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
+        wp_register_plugin_realpath($plugin);
+
         include_once( $plugin );
+}
 unset( $plugin );
 
 // Load pluggable functions.