Ticket #29154: 29154.3.diff

src/wp-includes/plugin.php

@@ -675 +675 @@
 function plugin_basename( $file ) {
         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 ) {
                         $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 );
 

tests/phpunit/tests/functions/pluginBasename.php

@@ +1 @@
+<?php
+
+/**
+ * Tests for plugin_basename()
+ *
+ * @group functions.php
+ * @group plugins
+ */
+class Tests_Plugin_Basename extends WP_UnitTestCase {
+
+        /**
+         * @ticket 29154
+         */
+        function test_should_return_correct_basename_for_symlinked_plugins() {
+                global $wp_plugin_paths;
+
+                $old_wp_plugin_paths = $wp_plugin_paths;
+
+                $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' );
+
+                $wp_plugin_paths = $old_wp_plugin_paths;
+
+                $this->assertSame( 'a-symlinked-plugin/plugin.php', $basename );
+        }
+}