X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..refs/tags/wordpress-3.5.1:/wp-admin/includes/theme.php
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 1600aa70..1e26c0ba 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -6,55 +6,24 @@
* @subpackage Administration
*/
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.0.0
- *
- * @return unknown
- */
-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'];
- $ct->parent_theme = $themes[$current_theme]['Parent Theme'];
- $ct->template_dir = $themes[$current_theme]['Template Dir'];
- $ct->stylesheet_dir = $themes[$current_theme]['Stylesheet Dir'];
- $ct->template = $themes[$current_theme]['Template'];
- $ct->stylesheet = $themes[$current_theme]['Stylesheet'];
- $ct->screenshot = $themes[$current_theme]['Screenshot'];
- $ct->description = $themes[$current_theme]['Description'];
- $ct->author = $themes[$current_theme]['Author'];
- $ct->tags = $themes[$current_theme]['Tags'];
- $ct->theme_root = $themes[$current_theme]['Theme Root'];
- $ct->theme_root_uri = $themes[$current_theme]['Theme Root URI'];
- return $ct;
-}
-
/**
* Remove a theme
*
* @since 2.8.0
*
- * @param string $template Template directory of the theme to delete
+ * @param string $stylesheet Stylesheet of the theme to delete
* @param string $redirect Redirect to page when complete.
* @return mixed
*/
-function delete_theme($template, $redirect = '') {
+function delete_theme($stylesheet, $redirect = '') {
global $wp_filesystem;
- if ( empty($template) )
+ if ( empty($stylesheet) )
return false;
ob_start();
if ( empty( $redirect ) )
- $redirect = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+ $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
$data = ob_get_contents();
ob_end_clean();
@@ -80,7 +49,6 @@ function delete_theme($template, $redirect = '') {
return;
}
-
if ( ! is_object($wp_filesystem) )
return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
@@ -93,11 +61,11 @@ function delete_theme($template, $redirect = '') {
return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
$themes_dir = trailingslashit( $themes_dir );
- $theme_dir = trailingslashit($themes_dir . $template);
+ $theme_dir = trailingslashit($themes_dir . $stylesheet);
$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.'), $stylesheet) );
// Force refresh of theme update information
delete_site_transient('update_themes');
@@ -105,59 +73,6 @@ function delete_theme($template, $redirect = '') {
return true;
}
-/**
- * {@internal Missing Short Description}}
- *
- * @since 1.5.0
- *
- * @return unknown
- */
-function get_broken_themes() {
- global $wp_broken_themes;
-
- get_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
*
@@ -166,37 +81,7 @@ function get_allowed_themes() {
* @return array Key is the template name, value is the filename of the template
*/
function get_page_templates() {
- $themes = get_themes();
- $theme = get_current_theme();
- $templates = $themes[$theme]['Template Files'];
- $page_templates = array();
-
- if ( is_array( $templates ) ) {
- $base = array( trailingslashit(get_template_directory()), trailingslashit(get_stylesheet_directory()) );
-
- foreach ( $templates as $template ) {
- $basename = str_replace($base, '', $template);
-
- // don't allow template files in subdirectories
- if ( false !== strpos($basename, '/') )
- continue;
-
- if ( 'functions.php' == $basename )
- continue;
-
- $template_data = implode( '', file( $template ));
-
- $name = '';
- if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )
- $name = _cleanup_header_comment($name[1]);
-
- if ( !empty( $name ) ) {
- $page_templates[trim( $name )] = $basename;
- }
- }
- }
-
- return $page_templates;
+ return array_flip( wp_get_theme()->get_page_templates() );
}
/**
@@ -232,19 +117,17 @@ function theme_update_available( $theme ) {
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 ( ! is_a( $theme, 'WP_Theme' ) )
+ return;
+
+ $stylesheet = $theme->get_stylesheet();
if ( isset($themes_update->response[ $stylesheet ]) ) {
$update = $themes_update->response[ $stylesheet ];
- $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
+ $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_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;"';
+ $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') )
@@ -252,7 +135,7 @@ function theme_update_available( $theme ) {
else if ( empty($update['package']) )
printf( '' . __('There is a new version of %1$s available. View version %3$s details. Automatic update is 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 update automatically.') . '
', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+ printf( '' . __('There is a new version of %1$s available. View version %3$s details or update now.') . '
', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
}
}
}
@@ -262,12 +145,13 @@ function theme_update_available( $theme ) {
*
* @since 3.1.0
*
- * @return array Array of features keyed by category with translations keyed by slug.
+ * @param bool $api Optional. Whether try to fetch tags from the WP.org API. Defaults to true.
+ * @return array Array of features keyed by category with translations keyed by slug.
*/
-function get_theme_feature_list() {
+function get_theme_feature_list( $api = true ) {
// Hard-coded list is used if api not accessible.
$features = array(
- __('Colors') => array(
+ __( 'Colors' ) => array(
'black' => __( 'Black' ),
'blue' => __( 'Blue' ),
'brown' => __( 'Brown' ),
@@ -282,21 +166,21 @@ function get_theme_feature_list() {
'white' => __( 'White' ),
'yellow' => __( 'Yellow' ),
'dark' => __( 'Dark' ),
- 'light' => __( 'Light ')
+ 'light' => __( 'Light' ),
),
- __('Columns') => array(
+ __( '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' )
+ 'right-sidebar' => __( 'Right Sidebar' ),
),
- __('Width') => array(
+ __( 'Width' ) => array(
'fixed-width' => __( 'Fixed Width' ),
- 'flexible-width' => __( 'Flexible Width' )
+ 'flexible-width' => __( 'Flexible Width' ),
),
__( 'Features' ) => array(
@@ -309,6 +193,7 @@ function get_theme_feature_list() {
'editor-style' => __( 'Editor Style' ),
'featured-image-header' => __( 'Featured Image Header' ),
'featured-images' => __( 'Featured Images' ),
+ 'flexible-header' => __( 'Flexible Header' ),
'front-page-post-form' => __( 'Front Page Posting' ),
'full-width-template' => __( 'Full Width Template' ),
'microformats' => __( 'Microformats' ),
@@ -317,21 +202,21 @@ function get_theme_feature_list() {
'sticky-post' => __( 'Sticky Post' ),
'theme-options' => __( 'Theme Options' ),
'threaded-comments' => __( 'Threaded Comments' ),
- 'translation-ready' => __( 'Translation Ready' )
+ 'translation-ready' => __( 'Translation Ready' ),
),
__( 'Subject' ) => array(
'holiday' => __( 'Holiday' ),
'photoblogging' => __( 'Photoblogging' ),
- 'seasonal' => __( 'Seasonal' )
+ 'seasonal' => __( 'Seasonal' ),
)
);
- if ( !current_user_can('install_themes') )
+ if ( ! $api || ! 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);
+ set_site_transient( 'wporg_theme_feature_list', array( ), 10800);
if ( !$feature_list ) {
$feature_list = themes_api( 'feature_list', array( ) );
@@ -399,15 +284,13 @@ function themes_api($action, $args = null) {
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() );
+ $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() );
} else {
- $res = unserialize( wp_remote_retrieve_body( $request ) );
- if ( ! $res )
- $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
+ $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
+ if ( ! is_object( $res ) && ! is_array( $res ) )
+ $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) );
}
}
- //var_dump(array($args, $res));
+
return apply_filters('themes_api_result', $res, $action, $args);
}
-
-?>