WordPress 3.4.2

[autoinstalls/wordpress.git] / wp-includes / class-wp-theme.php

diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index 049bfb4bd297291f8aee0d4d75692d4c7b22d7b2..c45bf78c96a972a88d79d927a1fba5ade6b197b1 100644 (file)
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -794,7 +794,7 @@ final class WP_Theme implements ArrayAccess {
         * @return string URL to the stylesheet directory.
         */
        public function get_stylesheet_directory_uri() {
         * @return string URL to the stylesheet directory.
         */
        public function get_stylesheet_directory_uri() {

-               return $this->get_theme_root_uri() . '/' . $this->stylesheet;
+               return $this->get_theme_root_uri() . '/' . str_replace( '%2F', '/', rawurlencode( $this->stylesheet ) );

        }
 
        /**
        }
 
        /**


@@ -814,7 +814,7 @@ final class WP_Theme implements ArrayAccess {
                else
                        $theme_root_uri = $this->get_theme_root_uri();
 
                else
                        $theme_root_uri = $this->get_theme_root_uri();
 

-               return $theme_root . '/' . $this->template;
+               return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );

        }
 
        /**
        }
 
        /**


@@ -1071,7 +1071,8 @@ final class WP_Theme implements ArrayAccess {
         * @return array Array of stylesheet names.
         */
        public static function get_allowed( $blog_id = null ) {
         * @return array Array of stylesheet names.
         */
        public static function get_allowed( $blog_id = null ) {

-               return self::get_allowed_on_network() + self::get_allowed_on_site( $blog_id );
+               $network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
+               return $network + self::get_allowed_on_site( $blog_id );

        }
 
        /**
        }
 
        /**