Changeset 37983

Timestamp:

07/06/2016 09:44:58 AM (10 years ago)

Author:

ocean90

Message:

Plugins: In plugin_basename() sort plugin paths before resolving symlinks.

arsort() sorts the paths reverse-alphabetically while preserving the keys. It results in a longer path being listed before a shorter one with the same base directory(ies).

Props jdgrimes, ocean90.
Fixes #28441.

Location:

trunk

Files:

• src/wp-includes/plugin.php (modified) (1 diff)
• tests/phpunit/tests/functions/pluginBasename.php (modified) (1 diff)

trunk/src/wp-includes/plugin.php

@@ -732 +732 @@
         $file = wp_normalize_path( $file );
 
+        arsort( $wp_plugin_paths );
         foreach ( $wp_plugin_paths as $dir => $realdir ) {
                 if ( strpos( $file, $realdir ) === 0 ) {

trunk/tests/phpunit/tests/functions/pluginBasename.php

@@ -10 +10 @@
 
         /**
+         * @var array
+         */
+        protected $wp_plugin_paths_backup;
+
+        /**
+         * Normalized path to plugin directory.
+         *
+         * @var string
+         */
+        protected $wp_plugin_path;
+
+        public function setUp() {
+                parent::setUp();
+
+                $this->wp_plugin_paths_backup = $GLOBALS['wp_plugin_paths'];
+                $this->wp_plugin_path = wp_normalize_path( WP_PLUGIN_DIR );
+        }
+
+        public function tearDown() {
+                $GLOBALS['wp_plugin_paths'] = $this->wp_plugin_paths_backup;
+
+                parent::tearDown();
+        }
+
+        /**
          * @ticket 29154
          */
-        function test_should_return_correct_basename_for_symlinked_plugins() {
+        function test_return_correct_basename_for_symlinked_plugins() {
                 global $wp_plugin_paths;
 
-                $old_wp_plugin_paths = $wp_plugin_paths;
-
-                $wp_plugin_paths[ wp_normalize_path( WP_PLUGIN_DIR ) . '/a-symlinked-plugin' ] = 'C:/www/path/plugins/a-plugin';
+                $wp_plugin_paths = array(
+                        $this->wp_plugin_path . '/a-symlinked-plugin' => 'C:/www/path/plugins/a-plugin',
+                );
 
                 $basename = plugin_basename( 'c:\www\path\plugins\a-plugin\plugin.php' );
-
-                $wp_plugin_paths = $old_wp_plugin_paths;
-
                 $this->assertSame( 'a-symlinked-plugin/plugin.php', $basename );
         }
+
+        /**
+         * @ticket 28441
+         */
+        function test_return_correct_basename_for_symlinked_plugins_with_path_conflicts() {
+                global $wp_plugin_paths;
+
+                $wp_plugin_paths = array(
+                        $this->wp_plugin_path . '/plugin' => '/Users/me/Dropbox/Development/Repositories/plugin',
+                        $this->wp_plugin_path . '/trunk' => '/Users/me/Dropbox/Development/Repositories/plugin/trunk',
+                );
+
+                $basename = plugin_basename( '/Users/me/Dropbox/Development/Repositories/plugin/trunk/plugin.php' );
+                $this->assertSame( 'trunk/plugin.php', $basename );
+        }
 }