Wordpress 3.5.2
[autoinstalls/wordpress.git] / wp-includes / class-wp-theme.php
index 049bfb4bd297291f8aee0d4d75692d4c7b22d7b2..7585fba9519d0245c16839b7baf14b33a4f721bb 100644 (file)
@@ -41,6 +41,7 @@ final class WP_Theme implements ArrayAccess {
                'default'      => 'WordPress Default',
                'twentyten'    => 'Twenty Ten',
                'twentyeleven' => 'Twenty Eleven',
+               'twentytwelve' => 'Twenty Twelve',
        );
 
        /**
@@ -253,6 +254,7 @@ final class WP_Theme implements ArrayAccess {
                                // Parent theme is missing.
                                $this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), $this->template ) );
                                $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+                               $this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
                                return;
                        }
                }
@@ -794,7 +796,7 @@ final class WP_Theme implements ArrayAccess {
         * @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 +816,7 @@ final class WP_Theme implements ArrayAccess {
                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 +1073,8 @@ final class WP_Theme implements ArrayAccess {
         * @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 );
        }
 
        /**
@@ -1101,7 +1104,7 @@ final class WP_Theme implements ArrayAccess {
        public static function get_allowed_on_site( $blog_id = null ) {
                static $allowed_themes = array();
 
-               if ( ! $blog_id )
+               if ( ! $blog_id || ! is_multisite() )
                        $blog_id = get_current_blog_id();
 
                if ( isset( $allowed_themes[ $blog_id ] ) )
@@ -1109,18 +1112,24 @@ final class WP_Theme implements ArrayAccess {
 
                $current = $blog_id == get_current_blog_id();
 
-               if ( $current )
+               if ( $current ) {
                        $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
-               else
-                       $allowed_themes[ $blog_id ] = get_blog_option( $blog_id, 'allowedthemes' );
+               } else {
+                       switch_to_blog( $blog_id );
+                       $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+                       restore_current_blog();
+               }
 
                // This is all super old MU back compat joy.
                // 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
                if ( false === $allowed_themes[ $blog_id ] ) {
-                       if ( $current )
+                       if ( $current ) {
                                $allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
-                       else
-                               $allowed_themes[ $blog_id ] = get_blog_option( $blog_id, 'allowed_themes' );
+                       } else {
+                               switch_to_blog( $blog_id );
+                               $allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+                               restore_current_blog();
+                       }
 
                        if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
                                $allowed_themes[ $blog_id ] = array();
@@ -1139,8 +1148,10 @@ final class WP_Theme implements ArrayAccess {
                                        update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
                                        delete_option( 'allowed_themes' );
                                } else {
-                                       update_blog_option( $blog_id, 'allowedthemes', $allowed_themes[ $blog_id ] );
-                                       delete_blog_option( $blog_id, 'allowed_themes' );
+                                       switch_to_blog( $blog_id );
+                                       update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
+                                       delete_option( 'allowed_themes' );
+                                       restore_current_blog();
                                }
                        }
                }