if ( empty($stylesheet) )
return false;
- ob_start();
- if ( empty( $redirect ) )
+ if ( empty( $redirect ) ) {
$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
- if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
- $data = ob_get_clean();
+ }
+
+ ob_start();
+ $credentials = request_filesystem_credentials( $redirect );
+ $data = ob_get_clean();
- if ( ! empty($data) ){
+ if ( false === $credentials ) {
+ if ( ! empty( $data ) ){
include_once( ABSPATH . 'wp-admin/admin-header.php');
echo $data;
include( ABSPATH . 'wp-admin/admin-footer.php');
return;
}
- if ( ! WP_Filesystem($credentials) ) {
- request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
+ if ( ! WP_Filesystem( $credentials ) ) {
+ ob_start();
+ request_filesystem_credentials( $redirect, '', true ); // Failed to connect, Error and request again.
$data = ob_get_clean();
if ( ! empty($data) ) {
}
}
+ // Remove the theme from allowed themes on the network.
+ if ( is_multisite() ) {
+ WP_Theme::network_disable_theme( $stylesheet );
+ }
+
// Force refresh of theme update information.
delete_site_transient( 'update_themes' );
$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( 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() ) {
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="%3$s">View version %4$s details</a>.' ) . '</strong></p>',
- $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
+ /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
+ $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
+ $theme_name,
+ esc_url( $details_url ),
+ sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+ /* translators: 1: theme name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+ ),
+ $update['new_version']
+ );
} elseif ( empty( $update['package'] ) ) {
- $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
- $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
+ /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
+ $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+ $theme_name,
+ esc_url( $details_url ),
+ sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+ /* translators: 1: theme name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+ ),
+ $update['new_version']
+ );
} else {
- $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.' ) . '</strong></p>',
- $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'], $update_url, $update_onclick );
+ /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
+ $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
+ $theme_name,
+ esc_url( $details_url ),
+ sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+ /* translators: 1: theme name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+ ),
+ $update['new_version'],
+ $update_url,
+ sprintf( 'aria-label="%s" id="update-theme" data-slug="%s"',
+ /* translators: %s: theme name */
+ esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ),
+ $stylesheet
+ )
+ );
}
}
}
function get_theme_feature_list( $api = true ) {
// Hard-coded list is used if api not accessible.
$features = array(
- __( 'Colors' ) => array(
- 'black' => __( 'Black' ),
- 'blue' => __( 'Blue' ),
- 'brown' => __( 'Brown' ),
- 'gray' => __( 'Gray' ),
- 'green' => __( 'Green' ),
- 'orange' => __( 'Orange' ),
- 'pink' => __( 'Pink' ),
- 'purple' => __( 'Purple' ),
- 'red' => __( 'Red' ),
- 'silver' => __( 'Silver' ),
- 'tan' => __( 'Tan' ),
- 'white' => __( 'White' ),
- 'yellow' => __( 'Yellow' ),
- 'dark' => __( 'Dark' ),
- 'light' => __( 'Light' ),
- ),
__( 'Layout' ) => array(
- 'fixed-layout' => __( 'Fixed Layout' ),
- 'fluid-layout' => __( 'Fluid Layout' ),
- 'responsive-layout' => __( 'Responsive Layout' ),
+ 'grid-layout' => __( 'Grid Layout' ),
'one-column' => __( 'One Column' ),
'two-columns' => __( 'Two Columns' ),
'three-columns' => __( 'Three Columns' ),
__( 'Features' ) => array(
'accessibility-ready' => __( 'Accessibility Ready' ),
- 'blavatar' => __( 'Blavatar' ),
'buddypress' => __( 'BuddyPress' ),
'custom-background' => __( 'Custom Background' ),
'custom-colors' => __( 'Custom Colors' ),
'custom-header' => __( 'Custom Header' ),
+ 'custom-logo' => __( 'Custom Logo' ),
'custom-menu' => __( 'Custom Menu' ),
'editor-style' => __( 'Editor Style' ),
'featured-image-header' => __( 'Featured Image Header' ),
'featured-images' => __( 'Featured Images' ),
'flexible-header' => __( 'Flexible Header' ),
+ 'footer-widgets' => __( 'Footer Widgets' ),
'front-page-post-form' => __( 'Front Page Posting' ),
'full-width-template' => __( 'Full Width Template' ),
'microformats' => __( 'Microformats' ),
),
__( 'Subject' ) => array(
- 'holiday' => __( 'Holiday' ),
- 'photoblogging' => __( 'Photoblogging' ),
- 'seasonal' => __( 'Seasonal' ),
+ 'blog' => __( 'Blog' ),
+ 'e-commerce' => __( 'E-Commerce' ),
+ 'education' => __( 'Education' ),
+ 'entertainment' => __( 'Entertainment' ),
+ 'food-and-drink' => __( 'Food & Drink' ),
+ 'holiday' => __( 'Holiday' ),
+ 'news' => __( 'News' ),
+ 'photography' => __( 'Photography' ),
+ 'portfolio' => __( 'Portfolio' ),
)
);
set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
$category_translations = array(
- 'Colors' => __( 'Colors' ),
'Layout' => __( 'Layout' ),
'Features' => __( 'Features' ),
- 'Subject' => __( 'Subject' )
+ 'Subject' => __( 'Subject' ),
);
// Loop over the wporg canonical list and apply translations
*
* The second filter, {@see 'themes_api'}, allows a plugin to override the WordPress.org
* Theme API entirely. If `$action` is 'query_themes', 'theme_information', or 'feature_list',
- * an object MUST be passed. If `$action` is 'hot_tags`, an array should be passed.
+ * an object MUST be passed. If `$action` is 'hot_tags', an array should be passed.
*
* Finally, the third filter, {@see 'themes_api_result'}, makes it possible to filter the
* response object or array, depending on the `$action` type.
}
/**
- * Filter arguments used to query for installer pages from the WordPress.org Themes API.
+ * Filters arguments used to query for installer pages from the WordPress.org Themes API.
*
* Important: An object MUST be returned to this filter.
*
$args = apply_filters( 'themes_api_args', $args, $action );
/**
- * Filter whether to override the WordPress.org Themes API.
+ * Filters whether to override the WordPress.org Themes API.
*
* Passing a non-false value will effectively short-circuit the WordPress.org API request.
*
* If `$action` is 'query_themes', 'theme_information', or 'feature_list', an object MUST
- * be passed. If `$action` is 'hot_tags`, an array should be passed.
+ * be passed. If `$action` is 'hot_tags', an array should be passed.
*
* @since 2.8.0
*
}
/**
- * Filter the returned WordPress.org Themes API response.
+ * Filters 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.
+ * @param array|object|WP_Error $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 );
}
$current_theme = get_stylesheet();
/**
- * Filter theme data before it is prepared for JavaScript.
+ * Filters theme data before it is prepared for JavaScript.
*
* Passing a non-empty array will result in wp_prepare_themes_for_js() returning
* early with that value instead.
}
/**
- * Filter the themes prepared for JavaScript, for themes.php.
+ * Filters the themes prepared for JavaScript, for themes.php.
*
* Could be useful for changing the order, which is by name by default.
*
?>
<script type="text/html" id="tmpl-customize-themes-details-view">
<div class="theme-backdrop"></div>
- <div class="theme-wrap">
+ <div class="theme-wrap wp-clearfix">
<div class="theme-header">
<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
</div>
- <div class="theme-about">
+ <div class="theme-about wp-clearfix">
<div class="theme-screenshots">
<# if ( data.screenshot[0] ) { #>
<div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
<# if ( ! data.active ) { #>
<div class="theme-actions">
<div class="inactive-theme">
- <a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
+ <?php
+ /* translators: %s: Theme name */
+ $aria_label = sprintf( __( 'Preview %s' ), '{{ data.name }}' );
+ ?>
+ <a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Live Preview' ); ?></a>
</div>
</div>
<# } #>
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff