Changeset 29249

Timestamp:

07/19/2014 11:06:54 PM (11 years ago)

Author:

wonderboymusic

Message:

Call untrailingslashit() when adding a theme directory in register_theme_directory(). This prevents double-slashing in generated URLs. Don't add a directory if it is already present.

Adds unit tests.
Props obenland, wonderboymusic.
Fixes #28662.

Location:

trunk

Files:

• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)

trunk/src/wp-includes/theme.php

@@ -371 +371 @@
         $directory = WP_CONTENT_DIR . '/' . $directory;
         // If this directory does not exist, return and do not register
-        if ( ! file_exists( $directory ) )
+        if ( ! file_exists( $directory ) ) {
             return false;
-    }
-
-    $wp_theme_directories[] = $directory;
+        }
+    }
+
+    if ( ! is_array( $wp_theme_directories ) ) {
+        $wp_theme_directories = array();
+    }
+
+    $untrailed = untrailingslashit( $directory );
+    if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
+        $wp_theme_directories[] = $untrailed;
+    }
 
     return true;

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -235 +235 @@
     }
 
+    /**
+     * @ticket 28662
+     */
+    function test_theme_dir_slashes() {
+        $size = count( $GLOBALS['wp_theme_directories'] );
+
+        @mkdir( WP_CONTENT_DIR . '/themes/foo' );
+        @mkdir( WP_CONTENT_DIR . '/themes/foo-themes' );
+
+        $this->assertTrue( file_exists( WP_CONTENT_DIR . '/themes/foo' ) );
+        $this->assertTrue( file_exists( WP_CONTENT_DIR . '/themes/foo-themes') );
+
+        register_theme_directory( '/' );
+
+        $this->assertCount( $size, $GLOBALS['wp_theme_directories'] );
+
+        register_theme_directory( 'themes/' );
+
+        $this->assertCount( $size, $GLOBALS['wp_theme_directories'] );
+
+        register_theme_directory( '/foo/' );
+
+        $this->assertCount( $size, $GLOBALS['wp_theme_directories'] );
+
+        register_theme_directory( 'foo/' );
+
+        $this->assertCount( $size, $GLOBALS['wp_theme_directories'] );
+
+        register_theme_directory( 'themes/foo/' );
+
+        $this->assertCount( $size + 1, $GLOBALS['wp_theme_directories'] );
+
+        register_theme_directory( WP_CONTENT_DIR . '/foo-themes/' );
+
+        $this->assertCount( $size + 1, $GLOBALS['wp_theme_directories'] );
+
+        foreach ( $GLOBALS['wp_theme_directories'] as $dir ) {
+            $this->assertNotEquals( '/', substr( $dir, -1 ) );
+        }
+
+        rmdir( WP_CONTENT_DIR . '/themes/foo' );
+        rmdir( WP_CONTENT_DIR . '/themes/foo-themes' );
+    }
 }