WordPress 3.8.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / theme.php

diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 315f021386982a01cd9cc089a69825534a1c7586..2d989204845394deea8eeba256e4f94931dc5833 100644 (file)
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -104,40 +104,59 @@ function _get_template_edit_filename($fullpath, $containingfolder) {
  * Will display link, if there is an update available.
  *
  * @since 2.7.0
  * Will display link, if there is an update available.
  *
  * @since 2.7.0

+ * @see get_theme_update_available()

  *
  * @param object $theme Theme data object.
  *
  * @param object $theme Theme data object.

- * @return bool False if no valid info was passed.

  */
 function theme_update_available( $theme ) {
  */
 function theme_update_available( $theme ) {

+       echo get_theme_update_available( $theme );
+}
+
+/**
+ * Retrieve the update link if there is a theme update available.
+ *
+ * Will return a link if there is an update available.
+ *
+ * @since 3.8.0
+ *
+ * @param WP_Theme $theme WP_Theme object.
+ * @return string|bool HTML for the update link, or false if invalid info was passed.
+ */
+function get_theme_update_available( $theme ) {

        static $themes_update;
 
        if ( !current_user_can('update_themes' ) )
        static $themes_update;
 
        if ( !current_user_can('update_themes' ) )

-               return;
+               return false;

 
        if ( !isset($themes_update) )
                $themes_update = get_site_transient('update_themes');
 
        if ( ! is_a( $theme, 'WP_Theme' ) )
 
        if ( !isset($themes_update) )
                $themes_update = get_site_transient('update_themes');
 
        if ( ! is_a( $theme, 'WP_Theme' ) )

-               return;
+               return false;

 
        $stylesheet = $theme->get_stylesheet();
 
 
        $stylesheet = $theme->get_stylesheet();
 

+       $html = '';
+

        if ( isset($themes_update->response[ $stylesheet ]) ) {
                $update = $themes_update->response[ $stylesheet ];
                $theme_name = $theme->display('Name');
                $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.
        if ( isset($themes_update->response[ $stylesheet ]) ) {
                $update = $themes_update->response[ $stylesheet ];
                $theme_name = $theme->display('Name');
                $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_url = wp_nonce_url( admin_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() ) {
                $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 now</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+                       if ( ! current_user_can('update_themes') ) {
+                               $html = sprintf( '<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'] ) ) {
+                               $html = sprintf( '<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 {
+                               $html = sprintf( '<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 now</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+                       }

                }
        }
                }
        }

+
+       return $html;

 }
 
 /**
 }
 
 /**


@@ -178,12 +197,14 @@ function get_theme_feature_list( $api = true ) {
                        'right-sidebar' => __( 'Right Sidebar' ),
                ),
 
                        'right-sidebar' => __( 'Right Sidebar' ),
                ),
 

-               __( 'Width' ) => array(
-                       'fixed-width'    => __( 'Fixed Width' ),
-                       'flexible-width' => __( 'Flexible Width' ),
+               __( 'Layout' ) => array(
+                       'fixed-layout'      => __( 'Fixed Layout' ),
+                       'fluid-layout'      => __( 'Fluid Layout' ),
+                       'responsive-layout' => __( 'Responsive Layout' ),

                ),
 
                __( 'Features' ) => array(
                ),
 
                __( 'Features' ) => array(

+                       'accessibility-ready'   => __( 'Accessibility Ready' ),

                        'blavatar'              => __( 'Blavatar' ),
                        'buddypress'            => __( 'BuddyPress' ),
                        'custom-background'     => __( 'Custom Background' ),
                        'blavatar'              => __( 'Blavatar' ),
                        'buddypress'            => __( 'BuddyPress' ),
                        'custom-background'     => __( 'Custom Background' ),


@@ -229,8 +250,13 @@ function get_theme_feature_list( $api = true ) {
 
        set_site_transient( 'wporg_theme_feature_list', $feature_list, 10800 );
 
 
        set_site_transient( 'wporg_theme_feature_list', $feature_list, 10800 );
 

-       $category_translations = array( 'Colors' => __('Colors'), 'Columns' => __('Columns'), 'Width' => __('Width'),
-                                                                  'Features' => __('Features'), 'Subject' => __('Subject') );
+       $category_translations = array(
+               'Colors'   => __( 'Colors' ),
+               'Columns'  => __( 'Columns' ),
+               'Layout'   => __( 'Layout' ),
+               'Features' => __( 'Features' ),
+               'Subject'  => __( 'Subject' )
+       );

 
        // Loop over the wporg canonical list and apply translations
        $wporg_features = array();
 
        // Loop over the wporg canonical list and apply translations
        $wporg_features = array();


@@ -266,23 +292,64 @@ function get_theme_feature_list( $api = true ) {
  *
  * @since 2.8.0
  *
  *
  * @since 2.8.0
  *

- * @param string $action
- * @param array|object $args Optional. Arguments to serialize for the Theme Info API.
+ * @param string       $action The requested action. Likely values are 'theme_information',
+ *                             'feature_list', or 'query_themes'.
+ * @param array|object $args   Optional. Arguments to serialize for the Theme Info API.

  * @return mixed
  */
  * @return mixed
  */

-function themes_api($action, $args = null) {
+function themes_api( $action, $args = null ) {

 
        if ( is_array($args) )
                $args = (object)$args;
 
        if ( !isset($args->per_page) )
                $args->per_page = 24;
 
        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.
+       /**
+        * Filter arguments used to query for installer pages from the WordPress.org Themes API.
+        *
+        * Important: An object MUST be returned to this filter.
+        *
+        * @since 2.8.0
+        *
+        * @param object $args   Arguments used to query for installer pages from the WordPress.org Themes API.
+        * @param string $action Requested action. Likely values are 'theme_information',
+        *                       'feature_list', or 'query_themes'.
+       */
+       $args = apply_filters( 'themes_api_args', $args, $action );
+
+       /**
+        * Filter whether to override the WordPress.org Themes API.
+        *
+        * Returning a value of true to this filter allows a theme to completely
+        * override the built-in WordPress.org API.
+        *
+        * @since 2.8.0
+        *
+        * @param bool   $bool   Whether to override the WordPress.org Themes API. Default false.
+        * @param string $action Requested action. Likely values are 'theme_information',
+        *                       'feature_list', or 'query_themes'.
+        * @param object $args   Arguments used to query for installer pages from the Themes API.
+        */
+       $res = apply_filters( 'themes_api', false, $action, $args );

 
        if ( ! $res ) {
 
        if ( ! $res ) {

-               $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
+               $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
+               if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+                       $url = set_url_scheme( $url, 'https' );
+
+               $args = array(
+                       'body' => array(
+                               'action' => $action,
+                               'request' => serialize( $args )
+                       )
+               );
+               $request = wp_remote_post( $url, $args );
+
+               if ( $ssl && is_wp_error( $request ) ) {
+                       trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+                       $request = wp_remote_post( $http_url, $args );
+               }
+

                if ( is_wp_error($request) ) {
                        $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
                } else {
                if ( is_wp_error($request) ) {
                        $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
                } else {


@@ -292,5 +359,97 @@ function themes_api($action, $args = null) {
                }
        }
 
                }
        }
 

-       return apply_filters('themes_api_result', $res, $action, $args);
+       /**
+        * Filter the returned WordPress.org Themes API response.
+        *
+        * @since 2.8.0
+        *
+        * @param array|object $res    WordPress.org Themes API response.
+        * @param string       $action Requested action. Likely values are 'theme_information',
+        *                             'feature_list', or 'query_themes'.
+        * @param object       $args   Arguments used to query for installer pages from the WordPress.org Themes API.
+        */
+       return apply_filters( 'themes_api_result', $res, $action, $args );

 }
 }

+
+/**
+ * Prepare themes for JavaScript.
+ *
+ * @since 3.8.0
+ *
+ * @param array $themes Optional. Array of WP_Theme objects to prepare.
+ *                      Defaults to all allowed themes.
+ *
+ * @return array An associative array of theme data, sorted by name.
+ */
+function wp_prepare_themes_for_js( $themes = null ) {
+       $current_theme = get_stylesheet();
+
+       // Make sure the current theme is listed first.
+       $prepared_themes = array( $current_theme => array() );
+
+       if ( null === $themes ) {
+               $themes = wp_get_themes( array( 'allowed' => true ) );
+               if ( ! isset( $themes[ $current_theme ] ) ) {
+                       $themes[ $current_theme ] = wp_get_theme();
+               }
+       }
+
+       $updates = array();
+       if ( current_user_can( 'update_themes' ) ) {
+               $updates_transient = get_site_transient( 'update_themes' );
+               if ( isset( $updates_transient->response ) ) {
+                       $updates = $updates_transient->response;
+               }
+       }
+
+       WP_Theme::sort_by_name( $themes );
+       foreach ( $themes as $theme ) {
+               $parent = false;
+               if ( $theme->parent() ) {
+                       $parent = $theme->parent()->display( 'Name' );
+               }
+
+               $slug = $theme->get_stylesheet();
+               $encoded_slug = urlencode( $slug );
+
+               $prepared_themes[ $slug ] = array(
+                       'id'           => $slug,
+                       'name'         => $theme->display( 'Name' ),
+                       'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple
+                       'description'  => $theme->display( 'Description' ),
+                       'author'       => $theme->display( 'Author', false, true ),
+                       'authorAndUri' => $theme->display( 'Author' ),
+                       'version'      => $theme->display( 'Version' ),
+                       'tags'         => $theme->display( 'Tags' ),
+                       'parent'       => $parent,
+                       'active'       => $slug === $current_theme,
+                       'hasUpdate'    => isset( $updates[ $slug ] ),
+                       'update'       => get_theme_update_available( $theme ),
+                       'actions'      => array(
+                               'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+                               'customize'=> current_user_can( 'edit_theme_options' ) ? wp_customize_url( $slug ) : null,
+                               'preview'   => add_query_arg( array(
+                                       'preview'        => 1,
+                                       'template'       => urlencode( $theme->get_template() ),
+                                       'stylesheet'     => urlencode( $slug ),
+                                       'preview_iframe' => true,
+                                       'TB_iframe'      => true,
+                               ), home_url( '/' ) ),
+                               'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+                       ),
+               );
+       }
+
+       /**
+        * Filter the themes prepared for JavaScript, for themes.php.
+        *
+        * Could be useful for changing the order, which is by name by default.
+        *
+        * @since 3.8.0
+        *
+        * @param array $prepared_themes Array of themes.
+        */
+       $prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
+       return array_values( $prepared_themes );
+}
\ No newline at end of file