Ticket #21065: 21065.2.patch

wp-content/themes/twentyten/style.css

@@ -6 +6 @@
 Version: 1.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu
+Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header
 Text Domain: twentyten
 */
 

wp-content/themes/twentyeleven/style.css

@@ -7 +7 @@
 Version: 1.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-width, flexible-width, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
+Tags: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-width, flexible-width, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
 Text Domain: twentyeleven
 */
 

wp-admin/includes/theme.php

@@ -151 +151 @@
 function get_theme_feature_list( $api = true ) {
         // Hard-coded list is used if api not accessible.
         $features = array(
-                        __('Colors') => array(
+                        __( 'Colors' ) => array(
                                 'black'   => __( 'Black' ),
                                 'blue'    => __( 'Blue' ),
                                 'brown'   => __( 'Brown' ),
@@ -169 +169 @@
                                 'light'   => __( 'Light' ),
                         ),
 
-                __('Columns') => array(
+                __( 'Columns' ) => array(
                         'one-column'    => __( 'One Column' ),
                         'two-columns'   => __( 'Two Columns' ),
                         'three-columns' => __( 'Three Columns' ),
@@ -178 +178 @@
                         'right-sidebar' => __( 'Right Sidebar' ),
                 ),
 
-                __('Width') => array(
+                __( 'Width' ) => array(
                         'fixed-width'    => __( 'Fixed Width' ),
                         'flexible-width' => __( 'Flexible Width' ),
                 ),
@@ -193 +193 @@
                         'editor-style'          => __( 'Editor Style' ),
                         'featured-image-header' => __( 'Featured Image Header' ),
                         'featured-images'       => __( 'Featured Images' ),
+                        'flexible-header'       => __( 'Flexible Header' ),
                         'front-page-post-form'  => __( 'Front Page Posting' ),
                         'full-width-template'   => __( 'Full Width Template' ),
                         'microformats'          => __( 'Microformats' ),