Changeset 28037 for trunk/src/wp-admin/includes/theme.php

Timestamp:

04/08/2014 04:30:01 AM (11 years ago)

Author:

nacin

Message:

Theme Installer: Combine 'Layout' and 'Columns' filters so 'Features' can span two columns.

see #27055.

File:

• trunk/src/wp-admin/includes/theme.php (modified) (3 diffs)

trunk/src/wp-admin/includes/theme.php

@@ -193 +193 @@
             ),
 
-        __( 'Columns' ) => array(
+        __( 'Layout' ) => array(
+            'fixed-layout'      => __( 'Fixed Layout' ),
+            'fluid-layout'      => __( 'Fluid Layout' ),
+            'responsive-layout' => __( 'Responsive Layout' ),
             'one-column'    => __( 'One Column' ),
             'two-columns'   => __( 'Two Columns' ),
@@ -200 +203 @@
             'left-sidebar'  => __( 'Left Sidebar' ),
             'right-sidebar' => __( 'Right Sidebar' ),
-        ),
-
-        __( 'Layout' ) => array(
-            'fixed-layout'      => __( 'Fixed Layout' ),
-            'fluid-layout'      => __( 'Fluid Layout' ),
-            'responsive-layout' => __( 'Responsive Layout' ),
         ),
 
@@ -257 +254 @@
     $category_translations = array(
         'Colors'   => __( 'Colors' ),
-        'Columns'  => __( 'Columns' ),
         'Layout'   => __( 'Layout' ),
         'Features' => __( 'Features' ),