Changes in trunk/wp-admin/includes/theme.php [17264:17928]

File:

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

trunk/wp-admin/includes/theme.php

@@ -164 +164 @@
  * @since 1.5.0
  *
- * @return array Key is template name, Value is template name
+ * @return array Key is the template name, value is the filename of the template
  */
 function get_page_templates() {
@@ -180 +180 @@
             // don't allow template files in subdirectories
             if ( false !== strpos($basename, '/') )
+                continue;
+
+            if ( 'functions.php' == $basename )
                 continue;
 
@@ -394 +397 @@
             $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
         } else {
-            $res = unserialize($request['body']);
+            $res = unserialize( wp_remote_retrieve_body( $request ) );
             if ( ! $res )
-            $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), $request['body']);
+            $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
         }
     }