Ticket #28441: 28441.2.patch

src/wp-includes/plugin.php

@@ -677 +677 @@
         // $wp_plugin_paths contains normalized paths.
         $file = wp_normalize_path( $file );
 
+        arsort( $wp_plugin_paths );
         foreach ( $wp_plugin_paths as $dir => $realdir ) {
                 if ( strpos( $file, $realdir ) === 0 ) {
                         $file = $dir . substr( $file, strlen( $realdir ) );

tests/phpunit/tests/functions/pluginBasename.php

@@ -9 +9 @@
 class Tests_Plugin_Basename extends WP_UnitTestCase {
 
         /**
+         * @var array
+         */
+        protected $wp_plugin_paths_backup;
+
+        public function setUp() {
+                parent::setUp();
+
+                $this->wp_plugin_paths_backup = $GLOBALS['wp_plugin_paths'];
+        }
+
+        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 = array(
+                        WP_PLUGIN_DIR . '/a-symlinked-plugin' => 'C:/www/path/plugins/a-plugin',
+                );
 
-                $wp_plugin_paths[ WP_PLUGIN_DIR . '/a-symlinked-plugin' ] = 'C:/www/path/plugins/a-plugin';
-
                 $basename = plugin_basename( 'c:\www\path\plugins\a-plugin\plugin.php' );
+                $this->assertSame( 'a-symlinked-plugin/plugin.php', $basename );
+        }
 
-                $wp_plugin_paths = $old_wp_plugin_paths;
+        /**
+         * @ticket 28441
+         */
+        function test_return_correct_basename_for_symlinked_plugins_with_path_conflicts() {
+                global $wp_plugin_paths;
 
-                $this->assertSame( 'a-symlinked-plugin/plugin.php', $basename );
+                $wp_plugin_paths = array(
+                        WP_PLUGIN_DIR . '/plugin' => '/Users/me/Dropbox/Development/Repositories/plugin',
+                        WP_PLUGIN_DIR . '/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 );
         }
 }