Changeset 20025

Timestamp:

02/28/2012 08:38:09 PM (13 years ago)

Author:

nacin

Message:

Add argument to get_theme_feature_list() to allow the tags to be returned without hitting the WP.org API. We'll be using this to translate tags. Remove trailing space in the 'Light' string. see #20103.

File:

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

trunk/wp-admin/includes/theme.php

@@ -271 +271 @@
  * @since 3.1.0
  *
+ * @param bool $api Optional. Whether try to fetch tags from the WP.org API. Defaults to true.
  * @return array Array of features keyed by category with translations keyed by slug.
  */
-function get_theme_feature_list() {
+function get_theme_feature_list( $api = true ) {
     // Hard-coded list is used if api not accessible.
     $features = array(
@@ -291 +292 @@
                 'yellow'  => __( 'Yellow' ),
                 'dark'    => __( 'Dark' ),
-                'light'   => __( 'Light ')
+                'light'   => __( 'Light' ),
             ),
 
@@ -300 +301 @@
             'four-columns'  => __( 'Four Columns' ),
             'left-sidebar'  => __( 'Left Sidebar' ),
-            'right-sidebar' => __( 'Right Sidebar' )
+            'right-sidebar' => __( 'Right Sidebar' ),
         ),
 
         __('Width') => array(
             'fixed-width'    => __( 'Fixed Width' ),
-            'flexible-width' => __( 'Flexible Width' )
+            'flexible-width' => __( 'Flexible Width' ),
         ),
 
@@ -326 +327 @@
             'theme-options'         => __( 'Theme Options' ),
             'threaded-comments'     => __( 'Threaded Comments' ),
-            'translation-ready'     => __( 'Translation Ready' )
+            'translation-ready'     => __( 'Translation Ready' ),
         ),
 
@@ -332 +333 @@
             'holiday'       => __( 'Holiday' ),
             'photoblogging' => __( 'Photoblogging' ),
-            'seasonal'      => __( 'Seasonal' )
+            'seasonal'      => __( 'Seasonal' ),
         )
     );
 
-    if ( !current_user_can('install_themes') )
+    if ( ! $api || ! current_user_can( 'install_themes' ) )
         return $features;