Changeset 27158

Timestamp:

02/10/2014 10:59:40 PM (13 years ago)

Author:

nacin

Message:

Detect and handle symlinking of plugins in plugin_basename().

props rmccue, MikeSchinkel, jdgrimes.
see #16953.

Location:

trunk/src

Files:

• wp-admin/includes/plugin.php (modified) (3 diffs)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/update.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/plugin.php (modified) (1 diff)
• wp-settings.php (modified) (3 diffs)

trunk/src/wp-admin/includes/plugin.php

@@ -538 +538 @@
                         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 ) {
@@ -922 +923 @@
 
                 define('WP_UNINSTALL_PLUGIN', $file);
+                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . dirname( $file ) );
                 include WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php';
 
@@ -933 +935 @@
                 unset($uninstallable_plugins);
 
+                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
                 include WP_PLUGIN_DIR . '/' . $file;
 

trunk/src/wp-admin/plugins.php

@@ -144 +144 @@
                         // Go back to "sandbox" scope so we get the same errors as before
                         function plugin_sandbox_scrape( $plugin ) {
+                                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
                                 include( WP_PLUGIN_DIR . '/' . $plugin );
                         }

trunk/src/wp-admin/update.php

@@ -85 +85 @@
                         error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
                         @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-                        include(WP_PLUGIN_DIR . '/' . $plugin);
+                        wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+                        include( WP_PLUGIN_DIR . '/' . $plugin );
                 }
                 iframe_footer();

trunk/src/wp-includes/functions.php

@@ -1432 +1432 @@
 
         return rtrim($base, '/') . '/' . ltrim($path, '/');
+}
+
+/**
+ * Normalize a filesystem path.
+ *
+ * Replaces backslashes with forward slashes for Windows systems,
+ * and ensures no duplicate slashes exist.
+ *
+ * @since 3.9.0
+ *
+ * @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;
 }
 

trunk/src/wp-includes/plugin.php

@@ -593 +593 @@
  * @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
+function plugin_basename( $file ) {
+        global $wp_plugin_paths;
+
+        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;
+}
+
+/**
+ * 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/src/wp-settings.php

@@ -165 +165 @@
 wp_plugin_directory_constants();
 
+$GLOBALS['wp_plugin_paths'] = array();
+
 // Load must-use plugins.
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {
+        wp_register_plugin_realpath( $mu_plugin );
         include_once( $mu_plugin );
 }
@@ -174 +177 @@
 if ( is_multisite() ) {
         foreach( wp_get_active_network_plugins() as $network_plugin ) {
+                wp_register_plugin_realpath( $network_plugin );
                 include_once( $network_plugin );
         }
@@ -207 +211 @@
 
 // Load active plugins.
-foreach ( wp_get_active_and_valid_plugins() as $plugin )
+foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
+        wp_register_plugin_realpath( $plugin );
         include_once( $plugin );
+}
 unset( $plugin );