Changeset 37332

Timestamp:

04/30/2016 03:08:06 PM (9 years ago)

Author:

ocean90

Message:

Plugins: In plugin_basename() normalize the file path before unresolving symlinks.

$wp_plugin_paths contains normalized paths, see wp_register_plugin_realpath().

Props jdgrimes, voldemortensen, flyingdr, ocean90.
Fixes #29154.

Location:

trunk

Files:

• src/wp-includes/plugin.php (modified) (2 diffs)
• tests/phpunit/tests/functions/pluginBasename.php (added)

trunk/src/wp-includes/plugin.php

@@ -676 +676 @@
     global $wp_plugin_paths;
 
+    // $wp_plugin_paths contains normalized paths.
+    $file = wp_normalize_path( $file );
+
     foreach ( $wp_plugin_paths as $dir => $realdir ) {
         if ( strpos( $file, $realdir ) === 0 ) {
@@ -682 +685 @@
     }
 
-    $file = wp_normalize_path( $file );
     $plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
     $mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );