Changeset 27710

Timestamp:

03/25/2014 01:06:21 PM (10 years ago)

Author:

nacin

Message:

Encode spaces in get_template_directory_uri() and get_stylesheet_directory_uri().

props SergeyBiryukov.
fixes #21969.

Location:

trunk

Files:

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

trunk/src/wp-includes/theme.php

@@ -188 +188 @@
  */
 function get_stylesheet_directory_uri() {
-    $stylesheet = get_stylesheet();
+    $stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
     $theme_root_uri = get_theme_root_uri( $stylesheet );
     $stylesheet_dir_uri = "$theme_root_uri/$stylesheet";
@@ -319 +319 @@
  */
 function get_template_directory_uri() {
-    $template = get_template();
+    $template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
     $theme_root_uri = get_theme_root_uri( $template );
     $template_dir_uri = "$theme_root_uri/$template";

trunk/tests/phpunit/tests/theme/WPTheme.php

@@ -111 +111 @@
     }
 
+    /**
+     * @ticket 21969
+     */
+    function test_theme_uris_with_spaces() {
+        $callback = array( $this, 'filter_theme_with_spaces' );
+        add_filter( 'stylesheet', $callback );
+        add_filter( 'template', $callback );
+
+        $this->assertEquals( get_theme_root_uri() . '/subdir/theme%20with%20spaces', get_stylesheet_directory_uri() );
+        $this->assertEquals( get_theme_root_uri() . '/subdir/theme%20with%20spaces', get_template_directory_uri() );
+
+        remove_filter( 'stylesheet', $callback );
+        add_filter( 'template', $callback );
+    }
+
+    function filter_theme_with_spaces() {
+        return 'subdir/theme with spaces';
+    }
 }