WordPress 3.8.3

[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 0d47f025c172360a29d837a6fce58f3872988297..511699adce66159a75fc46c809a4225cbc0b5ba2 100644 (file)
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -43,6 +43,15 @@ final class WP_Theme implements ArrayAccess {
                'twentyeleven'   => 'Twenty Eleven',
                'twentytwelve'   => 'Twenty Twelve',
                'twentythirteen' => 'Twenty Thirteen',
+               'twentyfourteen' => 'Twenty Fourteen',
+       );
+
+       /**
+        * Renamed theme tags.
+        */
+       private static $tag_map = array(
+               'fixed-width'    => 'fixed-layout',
+               'flexible-width' => 'fluid-layout',
        );
 
        /**
@@ -206,7 +215,7 @@ final class WP_Theme implements ArrayAccess {
                } elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
                        $this->headers['Name'] = $this->stylesheet;
                        if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-                               $this->errors = new WP_Error( 'theme_not_found', __( 'The theme directory does not exist.' ) );
+                               $this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), $this->stylesheet ) );
                        else
                                $this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
                        $this->template = $this->stylesheet;
@@ -705,8 +714,11 @@ final class WP_Theme implements ArrayAccess {
                                }
 
                                foreach ( $value as &$tag ) {
-                                       if ( isset( $tags_list[ $tag ] ) )
+                                       if ( isset( $tags_list[ $tag ] ) ) {
                                                $tag = $tags_list[ $tag ];
+                                       } elseif ( isset( self::$tag_map[ $tag ] ) ) {
+                                               $tag = $tags_list[ self::$tag_map[ $tag ] ];
+                                       }
                                }
 
                                return $value;