Changeset 30948 for branches/4.1/src/wp-admin/includes/plugin-install.php

Timestamp:

12/16/2014 11:23:17 PM (11 years ago)

Author:

johnbillion

Message:

Pass locale to wordpress.org theme/plugin API.

In the future this will be used to return localized plugin/theme info.

Merges [30944] to the 4.1 branch.

See #30735.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/plugin-install.php (modified) (1 diff)

branches/4.1/src/wp-admin/includes/plugin-install.php

@@ -29 +29 @@
 function plugins_api($action, $args = null) {
 
-    if ( is_array($args) )
-        $args = (object)$args;
-
-    if ( !isset($args->per_page) )
+    if ( is_array( $args ) ) {
+        $args = (object) $args;
+    }
+
+    if ( ! isset( $args->per_page ) ) {
         $args->per_page = 24;
+    }
+
+    if ( ! isset( $args->locale ) ) {
+        $args->locale = get_locale();
+    }
 
     /**