Changeset 15727

Timestamp:

10/05/2010 01:24:41 PM (14 years ago)

Author:

ryan

Message:

Move themes_api() to theme.php so that it is available to themes.php. see #14936

Location:

trunk/wp-admin/includes

Files:

• theme-install.php (modified) (1 diff)
• theme.php (modified) (1 diff)

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

@@ -19 +19 @@
     'tags' => true, 'num_ratings' => true
 );
-
-
-/**
- * Retrieve theme installer pages from WordPress Themes API.
- *
- * It is possible for a theme to override the Themes API result with three
- * filters. Assume this is for themes, which can extend on the Theme Info to
- * offer more choices. This is very powerful and must be used with care, when
- * overridding the filters.
- *
- * The first filter, 'themes_api_args', is for the args and gives the action as
- * the second parameter. The hook for 'themes_api_args' must ensure that an
- * object is returned.
- *
- * The second filter, 'themes_api', is the result that would be returned.
- *
- * @since 2.8.0
- *
- * @param string $action
- * @param array|object $args Optional. Arguments to serialize for the Theme Info API.
- * @return mixed
- */
-function themes_api($action, $args = null) {
-
-    if ( is_array($args) )
-        $args = (object)$args;
-
-    if ( !isset($args->per_page) )
-        $args->per_page = 24;
-
-    $args = apply_filters('themes_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter.
-    $res = apply_filters('themes_api', false, $action, $args); //NOTE: Allows a theme to completely override the builtin WordPress.org API.
-
-    if ( ! $res ) {
-        $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
-        if ( is_wp_error($request) ) {
-            $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occured during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
-        } else {
-            $res = unserialize($request['body']);
-            if ( ! $res )
-            $res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']);
-        }
-    }
-    //var_dump(array($args, $res));
-    return apply_filters('themes_api_result', $res, $action, $args);
-}
 
 /**

trunk/wp-admin/includes/theme.php

@@ -354 +354 @@
 }
 
+/**
+ * Retrieve theme installer pages from WordPress Themes API.
+ *
+ * It is possible for a theme to override the Themes API result with three
+ * filters. Assume this is for themes, which can extend on the Theme Info to
+ * offer more choices. This is very powerful and must be used with care, when
+ * overridding the filters.
+ *
+ * The first filter, 'themes_api_args', is for the args and gives the action as
+ * the second parameter. The hook for 'themes_api_args' must ensure that an
+ * object is returned.
+ *
+ * The second filter, 'themes_api', is the result that would be returned.
+ *
+ * @since 2.8.0
+ *
+ * @param string $action
+ * @param array|object $args Optional. Arguments to serialize for the Theme Info API.
+ * @return mixed
+ */
+function themes_api($action, $args = null) {
+
+    if ( is_array($args) )
+        $args = (object)$args;
+
+    if ( !isset($args->per_page) )
+        $args->per_page = 24;
+
+    $args = apply_filters('themes_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter.
+    $res = apply_filters('themes_api', false, $action, $args); //NOTE: Allows a theme to completely override the builtin WordPress.org API.
+
+    if ( ! $res ) {
+        $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
+        if ( is_wp_error($request) ) {
+            $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occured during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
+        } else {
+            $res = unserialize($request['body']);
+            if ( ! $res )
+            $res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']);
+        }
+    }
+    //var_dump(array($args, $res));
+    return apply_filters('themes_api_result', $res, $action, $args);
+}
+
 ?>