X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..5aa86a9053fb0fa15846bb60aac2fb8fdfff524a:/wp-admin/includes/theme-install.php diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index ea96ef8b..9171daba 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -19,57 +19,13 @@ $theme_field_defaults = array( 'description' => true, 'sections' => false, 'test '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.
Try again'), $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); -} - /** * Retrieve list of WordPress theme features (aka theme tags) * * @since 2.8.0 * + * @deprecated since 3.1.0 Use get_theme_feature_list() instead. + * * @return array */ function install_themes_feature_list( ) { @@ -88,59 +44,6 @@ function install_themes_feature_list( ) { return $feature_list; } -add_action('install_themes_search', 'install_theme_search', 10, 1); -/** - * Display theme search results - * - * @since 2.8.0 - * - * @param string $page - */ -function install_theme_search($page) { - global $theme_field_defaults; - - $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; - $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; - - $args = array(); - - switch( $type ){ - case 'tag': - $terms = explode(',', $term); - $terms = array_map('trim', $terms); - $terms = array_map('sanitize_title_with_dashes', $terms); - $args['tag'] = $terms; - break; - case 'term': - $args['search'] = $term; - break; - case 'author': - $args['author'] = $term; - break; - } - - $args['page'] = $page; - $args['fields'] = $theme_field_defaults; - - if ( !empty( $_POST['features'] ) ) { - $terms = $_POST['features']; - $terms = array_map( 'trim', $terms ); - $terms = array_map( 'sanitize_title_with_dashes', $terms ); - $args['tag'] = $terms; - $_REQUEST['s'] = implode( ',', $terms ); - $_REQUEST['type'] = 'tag'; - } - - $api = themes_api('query_themes', $args); - - if ( is_wp_error($api) ) - wp_die($api); - - add_action('install_themes_table_header', 'install_theme_search_form'); - - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - /** * Display search form for searching themes. * @@ -152,19 +55,19 @@ function install_theme_search_form() { ?>
- - 'featured', 'page' => $page, 'fields' => $theme_field_defaults); - $api = themes_api('query_themes', $args); - if ( is_wp_error($api) ) - wp_die($api); - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - -add_action('install_themes_new', 'install_themes_new', 10, 1); -/** - * Display new themes/ - * - * @since 2.8.0 - * - * @param string $page - */ -function install_themes_new($page = 1) { - global $theme_field_defaults; - $args = array('browse' => 'new', 'page' => $page, 'fields' => $theme_field_defaults); - $api = themes_api('query_themes', $args); - if ( is_wp_error($api) ) - wp_die($api); - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - -add_action('install_themes_updated', 'install_themes_updated', 10, 1); -/** - * Display recently updated themes. - * - * @since 2.8.0 - * - * @param string $page - */ -function install_themes_updated($page = 1) { - global $theme_field_defaults; - $args = array('browse' => 'updated', 'page' => $page, 'fields' => $theme_field_defaults); - $api = themes_api('query_themes', $args); - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - -add_action('install_themes_upload', 'install_themes_upload', 10, 1); function install_themes_upload($page = 1) { ?> - preview_url . '?TB_iframe=true&width=600&height=400'; if ( !is_array($actions) ) { $actions = array(); - $actions[] = 'slug . '&TB_iframe=true&tbWidth=500&tbHeight=385') . '" class="thickbox thickbox-preview onclick" title="' . esc_attr(sprintf(__('Install “%s”'), $name)) . '">' . __('Install') . ''; - $actions[] = '' . __('Preview') . ''; + if ( !is_network_admin() ) + $actions[] = '' . __('Preview') . ''; $actions = apply_filters('theme_install_action_links', $actions, $theme); } @@ -332,11 +172,11 @@ function display_theme($theme, $actions = null, $show_details = true) {- - |
' . __('Error: This theme is currently not available. Please try again later.') . '
' . __('ERROR: This theme is currently not available. Please try again later.') . '