Changeset 27999

Timestamp:

04/07/2014 08:14:34 PM (11 years ago)

Author:

nacin

Message:

Don't try to resolve symlinks for single-file plugins. plugins_url() should not be used in this context anyway.

props rmccue.
fixes #16953.

Location:

trunk/src

Files:

• wp-includes/plugin.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/plugin.php

@@ -639 +639 @@
  *
  * @param string $file Known path to the file.
+ * @return bool Whether the path was able to be registered.
  */
 function wp_register_plugin_realpath( $file ) {
     global $wp_plugin_paths;
 
+    // Normalize, but store as static to avoid recalculation of a constant value
+    static $wp_plugin_path, $wpmu_plugin_path;
+    if ( ! isset( $wp_plugin_path ) ) {
+        $wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR   );
+        $wpmu_plugin_path = wp_normalize_path( WPMU_PLUGIN_DIR );
+    }
+
     $plugin_path = wp_normalize_path( dirname( $file ) );
     $plugin_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
 
+    if ( $plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path ) {
+        return false;
+    }
+
     if ( $plugin_path !== $plugin_realpath ) {
         $wp_plugin_paths[ $plugin_path ] = $plugin_realpath;
     }
+
+    return true;
 }
 

trunk/src/wp-settings.php

@@ -169 +169 @@
 // Load must-use plugins.
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {
-    wp_register_plugin_realpath( $mu_plugin );
     include_once( $mu_plugin );
 }