X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..542cf06a610bc430421351ace7a2cc45f393b990:/wp-admin/includes/theme.php
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index b39351fc..44a1f629 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -16,6 +16,10 @@
function current_theme_info() {
$themes = get_themes();
$current_theme = get_current_theme();
+ if ( ! isset( $themes[$current_theme] ) ) {
+ delete_option( 'current_theme' );
+ $current_theme = get_current_theme();
+ }
$ct->name = $current_theme;
$ct->title = $themes[$current_theme]['Title'];
$ct->version = $themes[$current_theme]['Version'];
@@ -65,7 +69,7 @@ function delete_theme($template) {
request_filesystem_credentials($url, '', true); // Failed to connect, Error and request again
$data = ob_get_contents();
ob_end_clean();
- if( ! empty($data) ){
+ if ( ! empty($data) ) {
include_once( ABSPATH . 'wp-admin/admin-header.php');
echo $data;
include( ABSPATH . 'wp-admin/admin-footer.php');
@@ -79,7 +83,7 @@ function delete_theme($template) {
return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
- return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
+ return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
//Get the base plugin folder
$themes_dir = $wp_filesystem->wp_themes_dir();
@@ -87,17 +91,14 @@ function delete_theme($template) {
return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
$themes_dir = trailingslashit( $themes_dir );
-
- $errors = array();
-
$theme_dir = trailingslashit($themes_dir . $template);
$deleted = $wp_filesystem->delete($theme_dir, true);
if ( ! $deleted )
- return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s'), $template) );
+ return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $template) );
// Force refresh of theme update information
- delete_transient('update_themes');
+ delete_site_transient('update_themes');
return true;
}
@@ -116,6 +117,45 @@ function get_broken_themes() {
return $wp_broken_themes;
}
+/**
+ * Get the allowed themes for the current blog.
+ *
+ * @since 3.0.0
+ *
+ * @uses get_themes()
+ * @uses current_theme_info()
+ * @uses get_site_allowed_themes()
+ * @uses wpmu_get_blog_allowedthemes
+ *
+ * @return array $themes Array of allowed themes.
+ */
+function get_allowed_themes() {
+ if ( !is_multisite() )
+ return get_themes();
+
+ $themes = get_themes();
+ $ct = current_theme_info();
+ $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() );
+ if ( $allowed_themes == false )
+ $allowed_themes = array();
+
+ $blog_allowed_themes = wpmu_get_blog_allowedthemes();
+ if ( is_array( $blog_allowed_themes ) )
+ $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
+
+ if ( isset( $allowed_themes[ esc_html( $ct->stylesheet ) ] ) == false )
+ $allowed_themes[ esc_html( $ct->stylesheet ) ] = true;
+
+ reset( $themes );
+ foreach ( $themes as $key => $theme ) {
+ if ( isset( $allowed_themes[ esc_html( $theme[ 'Stylesheet' ] ) ] ) == false )
+ unset( $themes[ $key ] );
+ }
+ reset( $themes );
+
+ return $themes;
+}
+
/**
* Get the Page Templates available in this theme
*
@@ -156,10 +196,10 @@ function get_page_templates() {
/**
* Tidies a filename for url display by the theme editor.
- *
+ *
* @since 2.9.0
- * @private
- *
+ * @access private
+ *
* @param string $fullpath Full path to the theme file
* @param string $containingfolder Path of the theme parent folder
* @return string
@@ -168,4 +208,46 @@ function _get_template_edit_filename($fullpath, $containingfolder) {
return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
}
+/**
+ * Check if there is an update for a theme available.
+ *
+ * Will display link, if there is an update available.
+ *
+ * @since 2.7.0
+ *
+ * @param object $theme Theme data object.
+ * @return bool False if no valid info was passed.
+ */
+function theme_update_available( $theme ) {
+ static $themes_update;
+
+ if ( !current_user_can('update_themes' ) )
+ return;
+
+ if ( !isset($themes_update) )
+ $themes_update = get_site_transient('update_themes');
+
+ if ( is_object($theme) && isset($theme->stylesheet) )
+ $stylesheet = $theme->stylesheet;
+ elseif ( is_array($theme) && isset($theme['Stylesheet']) )
+ $stylesheet = $theme['Stylesheet'];
+ else
+ return false; //No valid info passed.
+
+ if ( isset($themes_update->response[ $stylesheet ]) ) {
+ $update = $themes_update->response[ $stylesheet ];
+ $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['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_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( '' . __('There is a new version of %1$s available. View version %3$s Details.') . '
', $theme_name, $details_url, $update['new_version']);
+ else if ( empty($update['package']) )
+ printf( '' . __('There is a new version of %1$s available. View version %3$s Details automatic upgrade unavailable for this theme.') . '
', $theme_name, $details_url, $update['new_version']);
+ else
+ printf( '' . __('There is a new version of %1$s available. View version %3$s Details or upgrade automatically.') . '
', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+ }
+}
+
?>