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

File:

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

trunk/wp-admin/includes/theme.php

@@ -10 +10 @@
  * {@internal Missing Short Description}}
  *
- * @since 2.0.0
+ * @since unknown
  *
  * @return unknown
@@ -44 +44 @@
  *
  * @param string $template Template directory of the theme to delete
- * @param string $redirect Redirect to page when complete.
  * @return mixed
  */
-function delete_theme($template, $redirect = '') {
+function delete_theme($template) {
         global $wp_filesystem;
 
@@ -54 +53 @@
 
         ob_start();
-        if ( empty( $redirect ) )
-                $redirect = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
-        if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
+        $url = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+        if ( false === ($credentials = request_filesystem_credentials($url)) ) {
                 $data = ob_get_contents();
                 ob_end_clean();
@@ -109 +107 @@
  * {@internal Missing Short Description}}
  *
- * @since 1.5.0
+ * @since unknown
  *
  * @return unknown
@@ -162 +160 @@
  * Get the Page Templates available in this theme
  *
- * @since 1.5.0
+ * @since unknown
  *
  * @return array Key is template name, Value is template name
@@ -242 +240 @@
                 $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
                 $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
-                $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made.  'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
-
-                if ( !is_multisite() ) {
-                        if ( ! current_user_can('update_themes') )
-                                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
-                        else if ( empty($update['package']) )
-                                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic update is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
-                        else
-                                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>update automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
-                }
-        }
-}
-
-/**
- * Retrieve list of WordPress theme features (aka theme tags)
- *
- * @since 3.1.0
- *
- * @return array  Array of features keyed by category with translations keyed by slug.
- */
-function get_theme_feature_list() {
-        // Hard-coded list is used if api not accessible.
-        $features = array(
-                        __('Colors') => array(
-                                'black'   => __( 'Black' ),
-                                'blue'    => __( 'Blue' ),
-                                'brown'   => __( 'Brown' ),
-                                'green'   => __( 'Green' ),
-                                'orange'  => __( 'Orange' ),
-                                'pink'    => __( 'Pink' ),
-                                'purple'  => __( 'Purple' ),
-                                'red'     => __( 'Red' ),
-                                'silver'  => __( 'Silver' ),
-                                'tan'     => __( 'Tan' ),
-                                'white'   => __( 'White' ),
-                                'yellow'  => __( 'Yellow' ),
-                                'dark'    => __( 'Dark' ),
-                                'light'   => __( 'Light ')
-                        ),
-
-                __('Columns') => array(
-                        'one-column'    => __( 'One Column' ),
-                        'two-columns'   => __( 'Two Columns' ),
-                        'three-columns' => __( 'Three Columns' ),
-                        'four-columns'  => __( 'Four Columns' ),
-                        'left-sidebar'  => __( 'Left Sidebar' ),
-                        'right-sidebar' => __( 'Right Sidebar' )
-                ),
-
-                __('Width') => array(
-                        'fixed-width'    => __( 'Fixed Width' ),
-                        'flexible-width' => __( 'Flexible Width' )
-                ),
-
-                __( 'Features' ) => array(
-                        'blavatar'             => __( 'Blavatar' ),
-                        'buddypress'           => __( 'BuddyPress' ),
-                        'custom-background'    => __( 'Custom Background' ),
-                        'custom-colors'        => __( 'Custom Colors' ),
-                        'custom-header'        => __( 'Custom Header' ),
-                        'custom-menu'          => __( 'Custom Menu' ),
-                        'editor-style'         => __( 'Editor Style' ),
-                        'front-page-post-form' => __( 'Front Page Posting' ),
-                        'microformats'         => __( 'Microformats' ),
-                        'sticky-post'          => __( 'Sticky Post' ),
-                        'theme-options'        => __( 'Theme Options' ),
-                        'threaded-comments'    => __( 'Threaded Comments' ),
-                        'translation-ready'    => __( 'Translation Ready' ),
-                        'rtl-language-support' => __( 'RTL Language Support' )
-                ),
-
-                __( 'Subject' )  => array(
-                        'holiday' => __( 'Holiday' ),
-                        'photoblogging' => __( 'Photoblogging' ),
-                        'seasonal' => __( 'Seasonal' )
-                )
-        );
-
-        if ( !current_user_can('install_themes') )
-                return $features;
-
-        if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-                set_site_transient( 'wporg_theme_feature_list', array( ),  10800);
-
-        if ( !$feature_list ) {
-                $feature_list = themes_api( 'feature_list', array( ) );
-                if ( is_wp_error( $feature_list ) )
-                        return $features;
-        }
-
-        if ( !$feature_list )
-                return $features;
-
-        set_site_transient( 'wporg_theme_feature_list', $feature_list, 10800 );
-
-        $category_translations = array( 'Colors' => __('Colors'), 'Columns' => __('Columns'), 'Width' => __('Width'),
-                                                                   'Features' => __('Features'), 'Subject' => __('Subject') );
-
-        // Loop over the wporg canonical list and apply translations
-        $wporg_features = array();
-        foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-                if ( isset($category_translations[$feature_category]) )
-                        $feature_category = $category_translations[$feature_category];
-                $wporg_features[$feature_category] = array();
-
-                foreach ( $feature_items as $feature ) {
-                        if ( isset($features[$feature_category][$feature]) )
-                                $wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
-                        else
-                                $wporg_features[$feature_category][$feature] = $feature;
-                }
-        }
-
-        return $wporg_features;
-}
-
-/**
- * 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 occurred during the API request.'), $request->get_error_message() );
-                } else {
-                        $res = unserialize($request['body']);
-                        if ( ! $res )
-                        $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), $request['body']);
-                }
-        }
-        //var_dump(array($args, $res));
-        return apply_filters('themes_api_result', $res, $action, $args);
+                $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made.  'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
+
+                if ( ! current_user_can('update_themes') )
+                        printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
+                else if ( empty($update['package']) )
+                        printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
+                else
+                        printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+        }
 }