- Version 3.4.2 +
+ Version 3.9
-
+ Semantic Personal Publishing Platform
Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.
+Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.
— Matt Mullenweg
wp-config.php file with your database connection details.
wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details.wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details.wp-config.php and upload it.wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.admin.If you are updating from version 2.7 or higher, you can use the automatic updater:
index.php.If you have customized your theme templates, you may have to make some changes across major versions.
-WordPress can import from a number of systems. First you need to get WordPress installed and working as described above, before using our import tools.
@@ -62,44 +60,34 @@If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:
+If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:
You can post to your WordPress blog with tools like Windows Live Writer, Ecto, w.bloggar, Radio Userland (which means you can use Radio's email-to-blog feature), NewzCrawler, and other tools that support the blogging APIs! :) You can read more about XML-RPC support on the Codex.
- -You can post from an email client! To set this up go to your "Writing" options screen and fill in the connection details for your secret POP3 account. Then you need to set up wp-mail.php to execute periodically to check the mailbox for new posts. You can do it with cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your wp-mail.php URL.
Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will delete emails that are successfully posted.
- -We introduced a very flexible roles system in version 2.0. You can read more about Roles and Capabilities on the Codex.
-WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better—you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.
-WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.
+WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.
WordPress is free software, and is released under the terms of the GPL version 2 or (at your option) any later version. See license.txt.
diff --git a/wordpress/wp-activate.php b/wordpress/wp-activate.php index d470772..5e9be6e 100644 --- a/wordpress/wp-activate.php +++ b/wordpress/wp-activate.php @@ -1,10 +1,17 @@ cache_enabled = false; +// Fix for page title +$wp_query->is_404 = false; + +/** + * Fires before the Site Activation page is loaded. + * + * @since 3.0.0 + */ do_action( 'activate_header' ); +/** + * Adds an action hook specific to this page that fires on wp_head + * + * @since MU + */ function do_activate_header() { - do_action( 'activate_wp_head' ); + /** + * Fires before the Site Activation page is loaded, but on the wp_head action. + * + * @since 3.0.0 + */ + do_action( 'activate_wp_head' ); } add_action( 'wp_head', 'do_activate_header' ); +/** + * Loads styles specific to this page. + * + * @since MU + */ function wpmu_activate_stylesheet() { ?>' . __('For more information:') . '
' . '' . __('Documentation on Import') . '
' . - '' . __('Support Forums') . '
' + '' . __('Support Forums') . '
' ); -$popular_importers = array(); -if ( current_user_can('install_plugins') ) - $popular_importers = array( - 'blogger' => array( __('Blogger'), __('Install the Blogger importer to import posts, comments, and users from a Blogger blog.'), 'install' ), - 'wpcat2tag' => array(__('Categories and Tags Converter'), __('Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.'), 'install', 'wp-cat2tag' ), - 'livejournal' => array( __( 'LiveJournal' ), __( 'Install the LiveJournal importer to import posts from LiveJournal using their API.' ), 'install' ), - 'movabletype' => array( __('Movable Type and TypePad'), __('Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.'), 'install', 'mt' ), - 'opml' => array( __('Blogroll'), __('Install the blogroll importer to import links in OPML format.'), 'install' ), - 'rss' => array( __('RSS'), __('Install the RSS importer to import posts from an RSS feed.'), 'install' ), - 'tumblr' => array( __('Tumblr'), __('Install the Tumblr importer to import posts & media from Tumblr using their API.'), 'install' ), - 'wordpress' => array( 'WordPress', __('Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'), 'install' ) - ); +if ( current_user_can( 'install_plugins' ) ) + $popular_importers = wp_get_popular_importers(); +else + $popular_importers = array(); -if ( ! empty( $_GET['invalid'] ) && !empty($popular_importers[$_GET['invalid']][3]) ) { - wp_redirect( admin_url('import.php?import=' . $popular_importers[$_GET['invalid']][3]) ); - exit; +// Detect and redirect invalid importers like 'movabletype', which is registered as 'mt' +if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) { + $importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id']; + if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops. + wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) ); + exit; + } + unset( $importer_id ); } add_thickbox(); wp_enqueue_script( 'plugin-install' ); -require_once ('admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); $parent_file = 'tools.php'; ?>%s importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?>
'.__('No importers are available.').'
'; // TODO: make more helpful +if ( empty( $importers ) ) { + echo '' . __('No importers are available.') . '
'; // TODO: make more helpful } else { - uasort($importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);')); + uasort( $importers, '_usort_by_first_member' ); ?> -| $action | {$data[1]} |
| '.__('Title').' | '.__('Date').' | '.__('Status').' |
|---|
| '.__('Title').' | '.__('Type').' | '.__('Date').' | '.__('Status').' | |
|---|---|---|---|---|
| '; - $html .= ' | '.esc_html( $time ).' | '.esc_html( $stat ).' | ||
| '; + $html .= ' | ' . esc_html( $post_types[$post->post_type]->labels->singular_name ) . ' | '.esc_html( $time ) . ' | ' . esc_html( $stat ). ' |
' . __( 'We’ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what’s new.' ) . '
'; + public static function pointer_wp330_toolbar() {} + public static function pointer_wp330_media_uploader() {} + public static function pointer_wp330_saving_widgets() {} + public static function pointer_wp340_customize_current_theme_link() {} + public static function pointer_wp340_choose_image_from_library() {} - if ( is_multisite() && is_super_admin() ) - $content .= '' . __( 'Network Admin is now located in the My Sites menu.' ) . '
'; + public static function pointer_wp350_media() { + $content = '' . __( 'Uploading files and creating image galleries has a whole new look. Check it out!' ) . '
'; - WP_Internal_Pointers::print_js( 'wp330_toolbar', '#wpadminbar', array( - 'content' => $content, - 'position' => array( 'edge' => 'top', 'align' => 'center' ), - ) ); - } - - /** - * Print 'Updated Media Uploader' for 3.3.0. - * - * @since 3.3.0 - */ - public static function pointer_wp330_media_uploader() { - $content = '' . __( 'The single media icon now launches the uploader for all file types, and the new drag and drop interface makes uploading a breeze.' ) . '
'; - - WP_Internal_Pointers::print_js( 'wp330_media_uploader', '#content-add_media', array( + self::print_js( 'wp350_media', '.insert-media', array( 'content' => $content, 'position' => array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'center' ), ) ); } - /** - * Print 'New Feature: Saving Widgets' for 3.3.0. - * - * @since 3.3.0 - */ - public static function pointer_wp330_saving_widgets() { - $content = '' . __( 'If you change your mind and revert to your previous theme, we’ll put the widgets back the way you had them.' ) . '
'; + public static function pointer_wp360_revisions() { + $content = '' . __( 'View, compare, and restore other versions of this content on the improved revisions screen.' ) . '
'; - WP_Internal_Pointers::print_js( 'wp330_saving_widgets', '#message2', array( - 'content' => $content, - 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left' ), + self::print_js( 'wp360_revisions', '.misc-pub-section.misc-pub-revisions', array( + 'content' => $content, + 'position' => array( 'edge' => is_rtl() ? 'left' : 'right', 'align' => 'center', 'my' => is_rtl() ? 'left' : 'right-14px' ), ) ); } - /** - * Print 'New Feature: Current Theme Customize Link' for 3.4.0. - * - * @since 3.4.0 - */ - public static function pointer_wp340_customize_current_theme_link() { - $content = '' . __( 'Click Customize to change the header, background, title and menus of the current theme, all in one place.' ) . '
'; - $content .= '' . __( 'Click the Live Preview links in the Available Themes list below to customize and preview another theme before activating it.' ) . '
'; + public static function pointer_wp360_locks() { + if ( ! is_multi_author() ) { + return; + } - WP_Internal_Pointers::print_js( 'wp340_customize_current_theme_link', '#customize-current-theme-link', array( - 'content' => $content, - 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left', 'offset' => is_rtl() ? '32 0' : '-32 0' ), + $content = '' . __( 'Someone else is editing this. No need to refresh; the lock will disappear when they’re done.' ) . '
'; + + self::print_js( 'wp360_locks', 'tr.wp-locked .locked-indicator', array( + 'content' => $content, + 'position' => array( 'edge' => 'left', 'align' => 'left' ), ) ); } - /** - * Print 'New Feature: Choose Image from Library' for 3.4.0. - * - * @since 3.4.0 - */ - public static function pointer_wp340_choose_image_from_library() { - $content = '' . __( 'Want to use an image you uploaded earlier? Select it from your media library instead of uploading it again.' ) . '
'; + public static function pointer_wp390_widgets() { + if ( ! current_theme_supports( 'widgets' ) ) { + return; + } - WP_Internal_Pointers::print_js( 'wp340_choose_image_from_library', '#choose-from-library-link', array( - 'content' => $content, - 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left', 'defer_loading' => true ), + $content = '' . __( 'Add, edit, and play around with your widgets from the theme customizer.' ) . ' ' . __( 'Preview your changes in real-time and only save them when you’re ready.' ) . '
'; + + if ( 'themes' === get_current_screen()->id ) { + $selector = '.theme.active .customize'; + $position = array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'center', 'my' => is_rtl() ? 'right-13px' : '' ); + } else { + $selector = 'a[href="customize.php"]'; + if ( is_rtl() ) { + $position = array( 'edge' => 'right', 'align' => 'center', 'my' => 'right-5px' ); + } else { + $position = array( 'edge' => 'left', 'align' => 'center', 'my' => 'left-5px' ); + } + } + + self::print_js( 'wp390_widgets', $selector, array( + 'content' => $content, + 'position' => $position, ) ); } @@ -1877,7 +2000,7 @@ final class WP_Internal_Pointers { * @since 3.3.0 */ public static function dismiss_pointers_for_new_users( $user_id ) { - add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp330_toolbar,wp330_media_uploader,wp330_saving_widgets,wp340_choose_image_from_library,wp340_customize_current_theme_link' ); + add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp350_media,wp360_revisions,wp360_locks,wp390_widgets' ); } } @@ -1900,3 +2023,80 @@ function convert_to_screen( $hook_name ) { return WP_Screen::get( $hook_name ); } + +/** + * Output the HTML for restoring the post data from DOM storage + * + * @since 3.6.0 + * @access private + */ +function _local_storage_notice() { + ?> + + 0, + 'type' => 'rating', + 'number' => 0, + ); + $r = wp_parse_args( $args, $defaults ); + extract( $r, EXTR_SKIP ); + + // Non-english decimal places when the $rating is coming from a string + $rating = str_replace( ',', '.', $rating ); + + // Convert Percentage to star rating, 0..5 in .5 increments + if ( 'percent' == $type ) { + $rating = round( $rating / 10, 0 ) / 2; + } + + // Calculate the number of each type of star needed + $full_stars = floor( $rating ); + $half_stars = ceil( $rating - $full_stars ); + $empty_stars = 5 - $full_stars - $half_stars; + + if ( $number ) { + /* translators: 1: The rating, 2: The number of ratings */ + $title = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $number ); + $title = sprintf( $title, number_format_i18n( $rating, 1 ), number_format_i18n( $number ) ); + } else { + /* translators: 1: The rating */ + $title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) ); + } + + echo ''; +} diff --git a/wordpress/wp-admin/includes/theme-install.php b/wordpress/wp-admin/includes/theme-install.php index 1fdafec..0a28e0f 100644 --- a/wordpress/wp-admin/includes/theme-install.php +++ b/wordpress/wp-admin/includes/theme-install.php @@ -28,18 +28,20 @@ $theme_field_defaults = array( 'description' => true, 'sections' => false, 'test * * @return array */ -function install_themes_feature_list( ) { +function install_themes_feature_list() { + _deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' ); + if ( !$cache = get_transient( 'wporg_theme_feature_list' ) ) - set_transient( 'wporg_theme_feature_list', array( ), 10800); + set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS ); if ( $cache ) return $cache; - $feature_list = themes_api( 'feature_list', array( ) ); + $feature_list = themes_api( 'feature_list', array() ); if ( is_wp_error( $feature_list ) ) - return $features; + return array(); - set_transient( 'wporg_theme_feature_list', $feature_list, 10800 ); + set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS ); return $feature_list; } @@ -50,21 +52,37 @@ function install_themes_feature_list( ) { * @since 2.8.0 */ function install_theme_search_form( $type_selector = true ) { - $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : 'term'; - $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : ''; + $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term'; + $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : ''; if ( ! $type_selector ) echo '' . __( 'Search for themes by keyword.' ) . '
'; ?> '; foreach ( (array) $feature_list as $feature_name => $features ) { @@ -114,20 +132,19 @@ function install_themes_dashboard() { - - - single_row( $theme ); + if ( ! isset( $wp_list_table ) ) { + $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); + } + $wp_list_table->prepare_items(); + $wp_list_table->single_row( $theme ); } /** @@ -148,12 +169,17 @@ function display_theme( $theme ) { function display_themes() { global $wp_list_table; + if ( ! isset( $wp_list_table ) ) { + $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); + } + $wp_list_table->prepare_items(); $wp_list_table->display(); + } -add_action('install_themes_search', 'display_themes'); -add_action('install_themes_featured', 'display_themes'); -add_action('install_themes_new', 'display_themes'); -add_action('install_themes_updated', 'display_themes'); +// add_action('install_themes_search', 'display_themes'); +// add_action('install_themes_featured', 'display_themes'); +// add_action('install_themes_new', 'display_themes'); +// add_action('install_themes_updated', 'display_themes'); /** * Display theme information in dialog box form. @@ -161,14 +187,17 @@ add_action('install_themes_updated', 'display_themes'); * @since 2.8.0 */ function install_theme_information() { - global $tab, $themes_allowedtags, $wp_list_table; + global $wp_list_table; - $theme = themes_api( 'theme_information', array( 'slug' => stripslashes( $_REQUEST['theme'] ) ) ); + $theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) ); if ( is_wp_error( $theme ) ) wp_die( $theme ); iframe_header( __('Theme Install') ); + if ( ! isset( $wp_list_table ) ) { + $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); + } $wp_list_table->theme_installer_single( $theme ); iframe_footer(); exit; diff --git a/wordpress/wp-admin/includes/theme.php b/wordpress/wp-admin/includes/theme.php index af1960e..ab665f8 100644 --- a/wordpress/wp-admin/includes/theme.php +++ b/wordpress/wp-admin/includes/theme.php @@ -23,7 +23,7 @@ function delete_theme($stylesheet, $redirect = '') { ob_start(); if ( empty( $redirect ) ) - $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . $stylesheet, 'delete-theme_' . $stylesheet); + $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(); @@ -37,7 +37,7 @@ function delete_theme($stylesheet, $redirect = '') { } if ( ! WP_Filesystem($credentials) ) { - request_filesystem_credentials($url, '', true); // Failed to connect, Error and request again + request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again $data = ob_get_contents(); ob_end_clean(); if ( ! empty($data) ) { @@ -78,10 +78,11 @@ function delete_theme($stylesheet, $redirect = '') { * * @since 1.5.0 * + * @param WP_Post|null $post Optional. The post being edited, provided for context. * @return array Key is the template name, value is the filename of the template */ -function get_page_templates() { - return array_flip( wp_get_theme()->get_page_templates() ); +function get_page_templates( $post = null ) { + return array_flip( wp_get_theme()->get_page_templates( $post ) ); } /** @@ -104,40 +105,62 @@ function _get_template_edit_filename($fullpath, $containingfolder) { * Will display link, if there is an update available. * * @since 2.7.0 + * @see get_theme_update_available() * * @param object $theme Theme data object. - * @return bool False if no valid info was passed. */ 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' ) ) - return; + return false; if ( !isset($themes_update) ) $themes_update = get_site_transient('update_themes'); if ( ! is_a( $theme, 'WP_Theme' ) ) - return; + return false; $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. - $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() ) { - 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 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 now.') . '
', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); + if ( ! current_user_can('update_themes') ) { + $html = sprintf( '' . __( 'There is a new version of %1$s available. View version %4$s details.' ) . '
', + $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] ); + } else if ( empty( $update['package'] ) ) { + $html = sprintf( '' . __( 'There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme.' ) . '
', + $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] ); + } else { + $html = sprintf( '' . __( 'There is a new version of %1$s available. View version %4$s details or update now.' ) . '
', + $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'], $update_url, $update_onclick ); + } } } + + return $html; } /** @@ -151,7 +174,7 @@ function theme_update_available( $theme ) { 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' ), @@ -169,7 +192,10 @@ function get_theme_feature_list( $api = true ) { 'light' => __( 'Light' ), ), - __('Columns') => array( + __( 'Layout' ) => array( + 'fixed-layout' => __( 'Fixed Layout' ), + 'fluid-layout' => __( 'Fluid Layout' ), + 'responsive-layout' => __( 'Responsive Layout' ), 'one-column' => __( 'One Column' ), 'two-columns' => __( 'Two Columns' ), 'three-columns' => __( 'Three Columns' ), @@ -178,12 +204,8 @@ function get_theme_feature_list( $api = true ) { 'right-sidebar' => __( 'Right Sidebar' ), ), - __('Width') => array( - 'fixed-width' => __( 'Fixed Width' ), - 'flexible-width' => __( 'Flexible Width' ), - ), - __( 'Features' ) => array( + 'accessibility-ready' => __( 'Accessibility Ready' ), 'blavatar' => __( 'Blavatar' ), 'buddypress' => __( 'BuddyPress' ), 'custom-background' => __( 'Custom Background' ), @@ -193,6 +215,7 @@ function get_theme_feature_list( $api = true ) { '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' ), @@ -215,10 +238,10 @@ function get_theme_feature_list( $api = true ) { 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( ) ); + $feature_list = themes_api( 'feature_list', array() ); if ( is_wp_error( $feature_list ) ) return $features; } @@ -228,8 +251,12 @@ function get_theme_feature_list( $api = true ) { 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' ), + 'Layout' => __( 'Layout' ), + 'Features' => __( 'Features' ), + 'Subject' => __( 'Subject' ) + ); // Loop over the wporg canonical list and apply translations $wporg_features = array(); @@ -265,31 +292,166 @@ function get_theme_feature_list( $api = true ) { * * @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 */ -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; + /** + * 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 ); - $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 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 ) { - $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 ) ) { + if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) { + trigger_error( __( '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.' ) . ' ' . __( '(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’s configuration. If you continue to have problems, please try the support forums.' ), $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 = 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 ) ); + $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 ) ); } } - 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&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&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 ); } diff --git a/wordpress/wp-admin/includes/update-core.php b/wordpress/wp-admin/includes/update-core.php index 392bb57..52f2171 100644 --- a/wordpress/wp-admin/includes/update-core.php +++ b/wordpress/wp-admin/includes/update-core.php @@ -292,20 +292,14 @@ $_old_files = array( 'wp-admin/css/colors-classic-rtl.dev.css', 'wp-admin/css/colors-fresh-rtl.css', 'wp-admin/css/colors-fresh-rtl.dev.css', -'wp-admin/css/dashboard-rtl.css', 'wp-admin/css/dashboard-rtl.dev.css', -'wp-admin/css/dashboard.css', 'wp-admin/css/dashboard.dev.css', -'wp-admin/css/farbtastic-rtl.css', 'wp-admin/css/global-rtl.css', 'wp-admin/css/global-rtl.dev.css', 'wp-admin/css/global.css', 'wp-admin/css/global.dev.css', -'wp-admin/css/install-rtl.css', 'wp-admin/css/install-rtl.dev.css', -'wp-admin/css/login-rtl.css', 'wp-admin/css/login-rtl.dev.css', -'wp-admin/css/login.css', 'wp-admin/css/login.dev.css', 'wp-admin/css/ms.css', 'wp-admin/css/ms.dev.css', @@ -317,9 +311,7 @@ $_old_files = array( 'wp-admin/css/plugin-install-rtl.dev.css', 'wp-admin/css/plugin-install.css', 'wp-admin/css/plugin-install.dev.css', -'wp-admin/css/press-this-rtl.css', 'wp-admin/css/press-this-rtl.dev.css', -'wp-admin/css/press-this.css', 'wp-admin/css/press-this.dev.css', 'wp-admin/css/theme-editor-rtl.css', 'wp-admin/css/theme-editor-rtl.dev.css', @@ -329,9 +321,7 @@ $_old_files = array( 'wp-admin/css/theme-install-rtl.dev.css', 'wp-admin/css/theme-install.css', 'wp-admin/css/theme-install.dev.css', -'wp-admin/css/widgets-rtl.css', 'wp-admin/css/widgets-rtl.dev.css', -'wp-admin/css/widgets.css', 'wp-admin/css/widgets.dev.css', 'wp-admin/includes/internal-linking.php', 'wp-includes/images/admin-bar-sprite-rtl.png', @@ -395,6 +385,280 @@ $_old_files = array( 'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js', // Don't delete, yet: 'wp-pass.php', // Don't delete, yet: 'wp-register.php', +// 3.5 +'wp-admin/gears-manifest.php', +'wp-admin/includes/manifest.php', +'wp-admin/images/archive-link.png', +'wp-admin/images/blue-grad.png', +'wp-admin/images/button-grad-active.png', +'wp-admin/images/button-grad.png', +'wp-admin/images/ed-bg-vs.gif', +'wp-admin/images/ed-bg.gif', +'wp-admin/images/fade-butt.png', +'wp-admin/images/fav-arrow-rtl.gif', +'wp-admin/images/fav-arrow.gif', +'wp-admin/images/fav-vs.png', +'wp-admin/images/fav.png', +'wp-admin/images/gray-grad.png', +'wp-admin/images/loading-publish.gif', +'wp-admin/images/logo-ghost.png', +'wp-admin/images/logo.gif', +'wp-admin/images/menu-arrow-frame-rtl.png', +'wp-admin/images/menu-arrow-frame.png', +'wp-admin/images/menu-arrows.gif', +'wp-admin/images/menu-bits-rtl-vs.gif', +'wp-admin/images/menu-bits-rtl.gif', +'wp-admin/images/menu-bits-vs.gif', +'wp-admin/images/menu-bits.gif', +'wp-admin/images/menu-dark-rtl-vs.gif', +'wp-admin/images/menu-dark-rtl.gif', +'wp-admin/images/menu-dark-vs.gif', +'wp-admin/images/menu-dark.gif', +'wp-admin/images/required.gif', +'wp-admin/images/screen-options-toggle-vs.gif', +'wp-admin/images/screen-options-toggle.gif', +'wp-admin/images/toggle-arrow-rtl.gif', +'wp-admin/images/toggle-arrow.gif', +'wp-admin/images/upload-classic.png', +'wp-admin/images/upload-fresh.png', +'wp-admin/images/white-grad-active.png', +'wp-admin/images/white-grad.png', +'wp-admin/images/widgets-arrow-vs.gif', +'wp-admin/images/widgets-arrow.gif', +'wp-admin/images/wpspin_dark.gif', +'wp-includes/images/upload.png', +'wp-includes/js/prototype.js', +'wp-includes/js/scriptaculous', +'wp-admin/css/wp-admin-rtl.dev.css', +'wp-admin/css/wp-admin.dev.css', +'wp-admin/css/media-rtl.dev.css', +'wp-admin/css/media.dev.css', +'wp-admin/css/colors-classic.dev.css', +'wp-admin/css/customize-controls-rtl.dev.css', +'wp-admin/css/customize-controls.dev.css', +'wp-admin/css/ie-rtl.dev.css', +'wp-admin/css/ie.dev.css', +'wp-admin/css/install.dev.css', +'wp-admin/css/colors-fresh.dev.css', +'wp-includes/js/customize-base.dev.js', +'wp-includes/js/json2.dev.js', +'wp-includes/js/comment-reply.dev.js', +'wp-includes/js/customize-preview.dev.js', +'wp-includes/js/wplink.dev.js', +'wp-includes/js/tw-sack.dev.js', +'wp-includes/js/wp-list-revisions.dev.js', +'wp-includes/js/autosave.dev.js', +'wp-includes/js/admin-bar.dev.js', +'wp-includes/js/quicktags.dev.js', +'wp-includes/js/wp-ajax-response.dev.js', +'wp-includes/js/wp-pointer.dev.js', +'wp-includes/js/hoverIntent.dev.js', +'wp-includes/js/colorpicker.dev.js', +'wp-includes/js/wp-lists.dev.js', +'wp-includes/js/customize-loader.dev.js', +'wp-includes/js/jquery/jquery.table-hotkeys.dev.js', +'wp-includes/js/jquery/jquery.color.dev.js', +'wp-includes/js/jquery/jquery.color.js', +'wp-includes/js/jquery/jquery.hotkeys.dev.js', +'wp-includes/js/jquery/jquery.form.dev.js', +'wp-includes/js/jquery/suggest.dev.js', +'wp-admin/js/xfn.dev.js', +'wp-admin/js/set-post-thumbnail.dev.js', +'wp-admin/js/comment.dev.js', +'wp-admin/js/theme.dev.js', +'wp-admin/js/cat.dev.js', +'wp-admin/js/password-strength-meter.dev.js', +'wp-admin/js/user-profile.dev.js', +'wp-admin/js/theme-preview.dev.js', +'wp-admin/js/post.dev.js', +'wp-admin/js/media-upload.dev.js', +'wp-admin/js/word-count.dev.js', +'wp-admin/js/plugin-install.dev.js', +'wp-admin/js/edit-comments.dev.js', +'wp-admin/js/media-gallery.dev.js', +'wp-admin/js/custom-fields.dev.js', +'wp-admin/js/custom-background.dev.js', +'wp-admin/js/common.dev.js', +'wp-admin/js/inline-edit-tax.dev.js', +'wp-admin/js/gallery.dev.js', +'wp-admin/js/utils.dev.js', +'wp-admin/js/widgets.dev.js', +'wp-admin/js/wp-fullscreen.dev.js', +'wp-admin/js/nav-menu.dev.js', +'wp-admin/js/dashboard.dev.js', +'wp-admin/js/link.dev.js', +'wp-admin/js/user-suggest.dev.js', +'wp-admin/js/postbox.dev.js', +'wp-admin/js/tags.dev.js', +'wp-admin/js/image-edit.dev.js', +'wp-admin/js/media.dev.js', +'wp-admin/js/customize-controls.dev.js', +'wp-admin/js/inline-edit-post.dev.js', +'wp-admin/js/categories.dev.js', +'wp-admin/js/editor.dev.js', +'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js', +'wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js', +'wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js', +'wp-includes/js/plupload/handlers.dev.js', +'wp-includes/js/plupload/wp-plupload.dev.js', +'wp-includes/js/swfupload/handlers.dev.js', +'wp-includes/js/jcrop/jquery.Jcrop.dev.js', +'wp-includes/js/jcrop/jquery.Jcrop.js', +'wp-includes/js/jcrop/jquery.Jcrop.css', +'wp-includes/js/imgareaselect/jquery.imgareaselect.dev.js', +'wp-includes/css/wp-pointer.dev.css', +'wp-includes/css/editor.dev.css', +'wp-includes/css/jquery-ui-dialog.dev.css', +'wp-includes/css/admin-bar-rtl.dev.css', +'wp-includes/css/admin-bar.dev.css', +'wp-includes/js/jquery/ui/jquery.effects.clip.min.js', +'wp-includes/js/jquery/ui/jquery.effects.scale.min.js', +'wp-includes/js/jquery/ui/jquery.effects.blind.min.js', +'wp-includes/js/jquery/ui/jquery.effects.core.min.js', +'wp-includes/js/jquery/ui/jquery.effects.shake.min.js', +'wp-includes/js/jquery/ui/jquery.effects.fade.min.js', +'wp-includes/js/jquery/ui/jquery.effects.explode.min.js', +'wp-includes/js/jquery/ui/jquery.effects.slide.min.js', +'wp-includes/js/jquery/ui/jquery.effects.drop.min.js', +'wp-includes/js/jquery/ui/jquery.effects.highlight.min.js', +'wp-includes/js/jquery/ui/jquery.effects.bounce.min.js', +'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js', +'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js', +'wp-includes/js/jquery/ui/jquery.effects.fold.min.js', +'wp-admin/images/screenshots/captions-1.png', +'wp-admin/images/screenshots/captions-2.png', +'wp-admin/images/screenshots/flex-header-1.png', +'wp-admin/images/screenshots/flex-header-2.png', +'wp-admin/images/screenshots/flex-header-3.png', +'wp-admin/images/screenshots/flex-header-media-library.png', +'wp-admin/images/screenshots/theme-customizer.png', +'wp-admin/images/screenshots/twitter-embed-1.png', +'wp-admin/images/screenshots/twitter-embed-2.png', +'wp-admin/js/utils.js', +'wp-admin/options-privacy.php', +'wp-app.php', +'wp-includes/class-wp-atom-server.php', +'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', +// 3.5.2 +'wp-includes/js/swfupload/swfupload-all.js', +// 3.6 +'wp-admin/js/revisions-js.php', +'wp-admin/images/screenshots', +'wp-admin/js/categories.js', +'wp-admin/js/categories.min.js', +'wp-admin/js/custom-fields.js', +'wp-admin/js/custom-fields.min.js', +// 3.7 +'wp-admin/js/cat.js', +'wp-admin/js/cat.min.js', +'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.min.js', +// 3.8 +'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif', +'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif', +'wp-includes/js/thickbox/tb-close-2x.png', +'wp-includes/js/thickbox/tb-close.png', +'wp-includes/images/wpmini-blue-2x.png', +'wp-includes/images/wpmini-blue.png', +'wp-admin/css/colors-fresh.css', +'wp-admin/css/colors-classic.css', +'wp-admin/css/colors-fresh.min.css', +'wp-admin/css/colors-classic.min.css', +'wp-admin/js/about.min.js', +'wp-admin/js/about.js', +'wp-admin/images/arrows-dark-vs-2x.png', +'wp-admin/images/wp-logo-vs.png', +'wp-admin/images/arrows-dark-vs.png', +'wp-admin/images/wp-logo.png', +'wp-admin/images/arrows-pr.png', +'wp-admin/images/arrows-dark.png', +'wp-admin/images/press-this.png', +'wp-admin/images/press-this-2x.png', +'wp-admin/images/arrows-vs-2x.png', +'wp-admin/images/welcome-icons.png', +'wp-admin/images/wp-logo-2x.png', +'wp-admin/images/stars-rtl-2x.png', +'wp-admin/images/arrows-dark-2x.png', +'wp-admin/images/arrows-pr-2x.png', +'wp-admin/images/menu-shadow-rtl.png', +'wp-admin/images/arrows-vs.png', +'wp-admin/images/about-search-2x.png', +'wp-admin/images/bubble_bg-rtl-2x.gif', +'wp-admin/images/wp-badge-2x.png', +'wp-admin/images/wordpress-logo-2x.png', +'wp-admin/images/bubble_bg-rtl.gif', +'wp-admin/images/wp-badge.png', +'wp-admin/images/menu-shadow.png', +'wp-admin/images/about-globe-2x.png', +'wp-admin/images/welcome-icons-2x.png', +'wp-admin/images/stars-rtl.png', +'wp-admin/images/wp-logo-vs-2x.png', +'wp-admin/images/about-updates-2x.png', +// 3.9 +'wp-admin/css/colors.css', +'wp-admin/css/colors.min.css', +'wp-admin/css/colors-rtl.css', +'wp-admin/css/colors-rtl.min.css', +'wp-admin/css/media-rtl.min.css', +'wp-admin/css/media.min.css', +'wp-admin/css/farbtastic-rtl.min.css', +'wp-admin/images/lock-2x.png', +'wp-admin/images/lock.png', +'wp-admin/js/theme-preview.js', +'wp-admin/js/theme-install.min.js', +'wp-admin/js/theme-install.js', +'wp-admin/js/theme-preview.min.js', +'wp-includes/js/plupload/plupload.html4.js', +'wp-includes/js/plupload/plupload.html5.js', +'wp-includes/js/plupload/changelog.txt', +'wp-includes/js/plupload/plupload.silverlight.js', +'wp-includes/js/plupload/plupload.flash.js', +'wp-includes/js/plupload/plupload.js', +'wp-includes/js/tinymce/plugins/spellchecker', +'wp-includes/js/tinymce/plugins/inlinepopups', +'wp-includes/js/tinymce/plugins/media/js', +'wp-includes/js/tinymce/plugins/media/css', +'wp-includes/js/tinymce/plugins/wordpress/img', +'wp-includes/js/tinymce/plugins/wpdialogs/js', +'wp-includes/js/tinymce/plugins/wpeditimage/img', +'wp-includes/js/tinymce/plugins/wpeditimage/js', +'wp-includes/js/tinymce/plugins/wpeditimage/css', +'wp-includes/js/tinymce/plugins/wpgallery/img', +'wp-includes/js/tinymce/plugins/wpfullscreen/css', +'wp-includes/js/tinymce/plugins/paste/js', +'wp-includes/js/tinymce/themes/advanced', +'wp-includes/js/tinymce/tiny_mce.js', +'wp-includes/js/tinymce/mark_loaded_src.js', +'wp-includes/js/tinymce/wp-tinymce-schema.js', +'wp-includes/js/tinymce/plugins/media/editor_plugin.js', +'wp-includes/js/tinymce/plugins/media/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/media/media.htm', +'wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wpview/editor_plugin.js', +'wp-includes/js/tinymce/plugins/directionality/editor_plugin.js', +'wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', +'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.js', +'wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', +'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', +'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', +'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', +'wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wplink/editor_plugin.js', +'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', +'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', +'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js', +'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/paste/editor_plugin.js', +'wp-includes/js/tinymce/plugins/paste/pasteword.htm', +'wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js', +'wp-includes/js/tinymce/plugins/paste/pastetext.htm', +'wp-includes/js/tinymce/langs/wp-langs.php', ); /** @@ -417,9 +681,12 @@ $_old_files = array( global $_new_bundled_files; $_new_bundled_files = array( -'plugins/akismet/' => '2.0', -'themes/twentyten/' => '3.0', -'themes/twentyeleven/' => '3.2' + 'plugins/akismet/' => '2.0', + 'themes/twentyten/' => '3.0', + 'themes/twentyeleven/' => '3.2', + 'themes/twentytwelve/' => '3.5', + 'themes/twentythirteen/' => '3.6', + 'themes/twentyfourteen/' => '3.8', ); /** @@ -473,11 +740,55 @@ function update_core($from, $to) { @set_time_limit( 300 ); + /** + * Filter feedback messages displayed during the core update process. + * + * The filter is first evaluated after the zip file for the latest version + * has been downloaded and unzipped. It is evaluated five more times during + * the process: + * + * 1. Before WordPress begins the core upgrade process. + * 2. Before Maintenance Mode is enabled. + * 3. Before WordPress begins copying over the necessary files. + * 4. Before Maintenance Mode is disabled. + * 5. Before the database is upgraded. + * + * @since 2.5.0 + * + * @param string $feedback The core update feedback messages. + */ + apply_filters( 'update_feedback', __( 'Verifying the unpacked files…' ) ); + + // Sanity check the unzipped distribution. + $distro = ''; + $roots = array( '/wordpress/', '/wordpress-mu/' ); + foreach ( $roots as $root ) { + if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . 'wp-includes/version.php' ) ) { + $distro = $root; + break; + } + } + if ( ! $distro ) { + $wp_filesystem->delete( $from, true ); + return new WP_Error( 'insane_distro', __('The update could not be unpacked') ); + } + + // Import $wp_version, $required_php_version, and $required_mysql_version from the new version + // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 + $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; + if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) { + $wp_filesystem->delete( $from, true ); + return new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' ); + } + + $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE ); + require( WP_CONTENT_DIR . '/upgrade/version-current.php' ); + $wp_filesystem->delete( $versions_file ); + $php_version = phpversion(); $mysql_version = $wpdb->db_version(); - $required_php_version = '5.2.4'; - $required_mysql_version = '5.0'; - $wp_version = '3.4.2'; + $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from + $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // a dash in the version indicates a Development release $php_compat = version_compare( $php_version, $required_php_version, '>=' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) $mysql_compat = true; @@ -494,31 +805,117 @@ function update_core($from, $to) { elseif ( !$mysql_compat ) return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) ); - // Sanity check the unzipped distribution - apply_filters('update_feedback', __('Verifying the unpacked files…')); - $distro = ''; - $roots = array( '/wordpress/', '/wordpress-mu/' ); - foreach( $roots as $root ) { - if ( $wp_filesystem->exists($from . $root . 'readme.html') && $wp_filesystem->exists($from . $root . 'wp-includes/version.php') ) { - $distro = $root; - break; + /** This filter is documented in wp-admin/includes/update-core.php */ + apply_filters( 'update_feedback', __( 'Preparing to install the latest version…' ) ); + + // Don't copy wp-content, we'll deal with that below + // We also copy version.php last so failed updates report their old version + $skip = array( 'wp-content', 'wp-includes/version.php' ); + $check_is_writable = array(); + + // Check to see which files don't really need updating - only available for 3.7 and higher + if ( function_exists( 'get_core_checksums' ) ) { + // Find the local version of the working directory + $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro; + + $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' ); + if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) ) + $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2 + if ( is_array( $checksums ) ) { + foreach( $checksums as $file => $checksum ) { + if ( 'wp-content' == substr( $file, 0, 10 ) ) + continue; + if ( ! file_exists( ABSPATH . $file ) ) + continue; + if ( ! file_exists( $working_dir_local . $file ) ) + continue; + if ( md5_file( ABSPATH . $file ) === $checksum ) + $skip[] = $file; + else + $check_is_writable[ $file ] = ABSPATH . $file; + } } } - if ( !$distro ) { - $wp_filesystem->delete($from, true); - return new WP_Error('insane_distro', __('The update could not be unpacked') ); + + // If we're using the direct method, we can predict write failures that are due to permissions. + if ( $check_is_writable && 'direct' === $wp_filesystem->method ) { + $files_writable = array_filter( $check_is_writable, array( $wp_filesystem, 'is_writable' ) ); + if ( $files_writable !== $check_is_writable ) { + $files_not_writable = array_diff_key( $check_is_writable, $files_writable ); + foreach ( $files_not_writable as $relative_file_not_writable => $file_not_writable ) { + // If the writable check failed, chmod file to 0644 and try again, same as copy_dir(). + $wp_filesystem->chmod( $file_not_writable, FS_CHMOD_FILE ); + if ( $wp_filesystem->is_writable( $file_not_writable ) ) + unset( $files_not_writable[ $relative_file_not_writable ] ); + } + + // Store package-relative paths (the key) of non-writable files in the WP_Error object. + $error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : ''; + + if ( $files_not_writable ) + return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) ); + } } - apply_filters('update_feedback', __('Installing the latest version…')); - + /** This filter is documented in wp-admin/includes/update-core.php */ + apply_filters( 'update_feedback', __( 'Enabling Maintenance mode…' ) ); // Create maintenance file to signal that we are upgrading $maintenance_string = ''; $maintenance_file = $to . '.maintenance'; $wp_filesystem->delete($maintenance_file); $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE); + /** This filter is documented in wp-admin/includes/update-core.php */ + apply_filters( 'update_feedback', __( 'Copying the required files…' ) ); // Copy new versions of WP files into place. - $result = _copy_dir($from . $distro, $to, array('wp-content') ); + $result = _copy_dir( $from . $distro, $to, $skip ); + if ( is_wp_error( $result ) ) + $result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) ); + + // Since we know the core files have copied over, we can now copy the version file + if ( ! is_wp_error( $result ) ) { + if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $to . 'wp-includes/version.php', true /* overwrite */ ) ) { + $wp_filesystem->delete( $from, true ); + $result = new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' ); + } + $wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE ); + } + + // Check to make sure everything copied correctly, ignoring the contents of wp-content + $skip = array( 'wp-content' ); + $failed = array(); + if ( isset( $checksums ) && is_array( $checksums ) ) { + foreach ( $checksums as $file => $checksum ) { + if ( 'wp-content' == substr( $file, 0, 10 ) ) + continue; + if ( ! file_exists( $working_dir_local . $file ) ) + continue; + if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum ) + $skip[] = $file; + else + $failed[] = $file; + } + } + + // Some files didn't copy properly + if ( ! empty( $failed ) ) { + $total_size = 0; + foreach ( $failed as $file ) { + if ( file_exists( $working_dir_local . $file ) ) + $total_size += filesize( $working_dir_local . $file ); + } + + // If we don't have enough free space, it isn't worth trying again. + // Unlikely to be hit due to the check in unzip_file(). + $available_space = @disk_free_space( ABSPATH ); + if ( $available_space && $total_size >= $available_space ) { + $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ) ); + } else { + $result = _copy_dir( $from . $distro, $to, $skip ); + if ( is_wp_error( $result ) ) + $result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) ); + } + } // Custom Content Directory needs updating now. // Copy Languages @@ -535,21 +932,40 @@ function update_core($from, $to) { if ( @is_dir($lang_dir) ) { $wp_lang_dir = $wp_filesystem->find_folder($lang_dir); - if ( $wp_lang_dir ) + if ( $wp_lang_dir ) { $result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir); + if ( is_wp_error( $result ) ) + $result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) ); + } + } + } + + /** This filter is documented in wp-admin/includes/update-core.php */ + apply_filters( 'update_feedback', __( 'Disabling Maintenance mode…' ) ); + // Remove maintenance file, we're done with potential site-breaking changes + $wp_filesystem->delete( $maintenance_file ); + + // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve. + if ( '3.5' == $old_wp_version ) { + if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' ) ) { + $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' ); } } // Copy New bundled plugins & themes // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue. + // $development_build controls us overwriting bundled themes and plugins when a non-stable release is being updated if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) { - $old_version = $GLOBALS['wp_version']; // $wp_version in local scope == new version foreach ( (array) $_new_bundled_files as $file => $introduced_version ) { - // If $introduced version is greater than what the site was previously running - if ( version_compare($introduced_version, $old_version, '>') ) { + // If a $development_build or if $introduced version is greater than what the site was previously running + if ( $development_build || version_compare( $introduced_version, $old_wp_version, '>' ) ) { $directory = ('/' == $file[ strlen($file)-1 ]); list($type, $filename) = explode('/', $file, 2); + // Check to see if the bundled items exist before attempting to copy them + if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) ) + continue; + if ( 'plugins' == $type ) $dest = $wp_filesystem->wp_plugins_dir(); elseif ( 'themes' == $type ) @@ -558,19 +974,24 @@ function update_core($from, $to) { continue; if ( ! $directory ) { - if ( $wp_filesystem->exists($dest . $filename) ) + if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) ) continue; if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) ) - $result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename); + $result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename ); } else { - if ( $wp_filesystem->is_dir($dest . $filename) ) + if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) ) continue; $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR); $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename); - if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going. - $result = $_result; + + // If a error occurs partway through this final step, keep the error flowing through, but keep process going. + if ( is_wp_error( $_result ) ) { + if ( ! is_wp_error( $result ) ) + $result = new WP_Error; + $result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) ); + } } } } //end foreach @@ -578,7 +999,6 @@ function update_core($from, $to) { // Handle $result error from the above blocks if ( is_wp_error($result) ) { - $wp_filesystem->delete($maintenance_file); $wp_filesystem->delete($from, true); return $result; } @@ -592,10 +1012,16 @@ function update_core($from, $to) { } // Upgrade DB with separate request - apply_filters('update_feedback', __('Upgrading database…')); + /** This filter is documented in wp-admin/includes/update-core.php */ + apply_filters( 'update_feedback', __( 'Upgrading database…' ) ); $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db'); wp_remote_post($db_upgrade_url, array('timeout' => 60)); + // Clear the cache to prevent an update_option() from saving a stale db_version to the cache + wp_cache_flush(); + // (Not all cache backends listen to 'flush') + wp_cache_delete( 'alloptions', 'options' ); + // Remove working directory $wp_filesystem->delete($from, true); @@ -605,12 +1031,19 @@ function update_core($from, $to) { else delete_option('update_core'); - // Remove maintenance file, we're done. - $wp_filesystem->delete($maintenance_file); - - // If we made it this far: + /** + * Fires after WordPress core has been successfully updated. + * + * @since 3.3.0 + * + * @param string $wp_version The current WordPress version. + */ do_action( '_core_updated_successfully', $wp_version ); + // Clear the option that blocks auto updates after failures, now that we've been successful. + if ( function_exists( 'delete_site_option' ) ) + delete_site_option( 'auto_core_update_failed' ); + return $wp_version; } @@ -618,10 +1051,12 @@ function update_core($from, $to) { * Copies a directory from one location to another via the WordPress Filesystem Abstraction. * Assumes that WP_Filesystem() has already been called and setup. * - * This is a temporary function for the 3.1 -> 3.2 upgrade only and will be removed in 3.3 + * This is a temporary function for the 3.1 -> 3.2 upgrade, as well as for those upgrading to + * 3.7+ * * @ignore * @since 3.2.0 + * @since 3.7.0 Updated not to use a regular expression for the skip list * @see copy_dir() * * @param string $from source directory @@ -637,31 +1072,31 @@ function _copy_dir($from, $to, $skip_list = array() ) { $from = trailingslashit($from); $to = trailingslashit($to); - $skip_regex = ''; - foreach ( (array)$skip_list as $key => $skip_file ) - $skip_regex .= preg_quote($skip_file, '!') . '|'; - - if ( !empty($skip_regex) ) - $skip_regex = '!(' . rtrim($skip_regex, '|') . ')$!i'; - foreach ( (array) $dirlist as $filename => $fileinfo ) { - if ( !empty($skip_regex) ) - if ( preg_match($skip_regex, $from . $filename) ) - continue; + if ( in_array( $filename, $skip_list ) ) + continue; if ( 'f' == $fileinfo['type'] ) { if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) { // If copy failed, chmod file to 0644 and try again. - $wp_filesystem->chmod($to . $filename, 0644); + $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE ); if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) - return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename); + return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename ); } } elseif ( 'd' == $fileinfo['type'] ) { if ( !$wp_filesystem->is_dir($to . $filename) ) { if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) ) - return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename); + return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename ); } - $result = _copy_dir($from . $filename, $to . $filename, $skip_list); + + // generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list + $sub_skip_list = array(); + foreach ( $skip_list as $skip_item ) { + if ( 0 === strpos( $skip_item, $filename . '/' ) ) + $sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item ); + } + + $result = _copy_dir($from . $filename, $to . $filename, $sub_skip_list); if ( is_wp_error($result) ) return $result; } @@ -680,10 +1115,10 @@ function _copy_dir($from, $to, $skip_list = array() ) { function _redirect_to_about_wordpress( $new_version ) { global $wp_version, $pagenow, $action; - if ( version_compare( $wp_version, '3.5-alpha', '>=' ) ) + if ( version_compare( $wp_version, '3.4-RC1', '>=' ) ) return; - // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts. + // Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts. if ( 'update-core.php' != $pagenow ) return; @@ -696,11 +1131,8 @@ function _redirect_to_about_wordpress( $new_version ) { // See do_core_upgrade() show_message( __('WordPress updated successfully') ); - $js_message = __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ); - $js_message = str_replace( '"%s"', '"%2$s"', $js_message ); // in lieu of breaking the string. - // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional. - show_message( '' ); + show_message( '' ); show_message( '' ); echo ''; ?> diff --git a/wordpress/wp-admin/includes/update.php b/wordpress/wp-admin/includes/update.php index e02d4de..c3f5490 100644 --- a/wordpress/wp-admin/includes/update.php +++ b/wordpress/wp-admin/includes/update.php @@ -6,75 +6,155 @@ * @subpackage Administration */ -// The admin side of our 1.1 update system - /** - * Selects the first update version from the update_core option + * Selects the first update version from the update_core option. * - * @return object the response from the API + * @return bool|object The response from the API on success, false on failure. */ function get_preferred_from_update_core() { $updates = get_core_updates(); - if ( !is_array( $updates ) ) + if ( ! is_array( $updates ) ) return false; if ( empty( $updates ) ) - return (object)array('response' => 'latest'); + return (object) array( 'response' => 'latest' ); return $updates[0]; } /** - * Get available core updates + * Get available core updates. * * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, * set $options['available'] to false to skip not-dismissed updates. - * @return array Array of the update objects + * @return bool|array Array of the update objects on success, false on failure. */ function get_core_updates( $options = array() ) { - $options = array_merge( array('available' => true, 'dismissed' => false ), $options ); + $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options ); $dismissed = get_site_option( 'dismissed_update_core' ); - if ( !is_array( $dismissed ) ) $dismissed = array(); + + if ( ! is_array( $dismissed ) ) + $dismissed = array(); + $from_api = get_site_transient( 'update_core' ); - if ( empty($from_api) ) + + if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) return false; - if ( !isset( $from_api->updates ) || !is_array( $from_api->updates ) ) return false; + $updates = $from_api->updates; - if ( !is_array( $updates ) ) return false; $result = array(); - foreach($updates as $update) { - if ( array_key_exists( $update->current.'|'.$update->locale, $dismissed ) ) { + foreach ( $updates as $update ) { + if ( $update->response == 'autoupdate' ) + continue; + + if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) { if ( $options['dismissed'] ) { $update->dismissed = true; - $result[]= $update; + $result[] = $update; } } else { if ( $options['available'] ) { $update->dismissed = false; - $result[]= $update; + $result[] = $update; } } } return $result; } +/** + * Gets the best available (and enabled) Auto-Update for WordPress Core. + * + * If there's 1.2.3 and 1.3 on offer, it'll choose 1.3 if the install allows it, else, 1.2.3 + * + * @since 3.7.0 + * + * @return bool|array False on failure, otherwise the core update offering. + */ +function find_core_auto_update() { + $updates = get_site_transient( 'update_core' ); + if ( ! $updates || empty( $updates->updates ) ) + return false; + + include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + + $auto_update = false; + $upgrader = new WP_Automatic_Updater; + foreach ( $updates->updates as $update ) { + if ( 'autoupdate' != $update->response ) + continue; + + if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) + continue; + + if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) + $auto_update = $update; + } + return $auto_update; +} + +/** + * Gets and caches the checksums for the given version of WordPress. + * + * @since 3.7.0 + * + * @param string $version Version string to query. + * @param string $locale Locale to query. + * @return bool|array False on failure. An array of checksums on success. + */ +function get_core_checksums( $version, $locale ) { + $return = array(); + + $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' ); + + if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) + $url = set_url_scheme( $url, 'https' ); + + $options = array( + 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ), + ); + + $response = wp_remote_get( $url, $options ); + if ( $ssl && is_wp_error( $response ) ) { + trigger_error( __( '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.' ) . ' ' . __( '(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 ); + $response = wp_remote_get( $http_url, $options ); + } + + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) + return false; + + $body = trim( wp_remote_retrieve_body( $response ) ); + $body = json_decode( $body, true ); + + if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) + return false; + + return $body['checksums']; +} + function dismiss_core_update( $update ) { $dismissed = get_site_option( 'dismissed_update_core' ); - $dismissed[ $update->current.'|'.$update->locale ] = true; + $dismissed[ $update->current . '|' . $update->locale ] = true; return update_site_option( 'dismissed_update_core', $dismissed ); } function undismiss_core_update( $version, $locale ) { $dismissed = get_site_option( 'dismissed_update_core' ); - $key = $version.'|'.$locale; - if ( !isset( $dismissed[$key] ) ) return false; + $key = $version . '|' . $locale; + + if ( ! isset( $dismissed[$key] ) ) + return false; + unset( $dismissed[$key] ); return update_site_option( 'dismissed_update_core', $dismissed ); } function find_core_update( $version, $locale ) { $from_api = get_site_transient( 'update_core' ); - if ( !is_array( $from_api->updates ) ) return false; + + if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) + return false; + $updates = $from_api->updates; - foreach($updates as $update) { + foreach ( $updates as $update ) { if ( $update->current == $version && $update->locale == $locale ) return $update; } @@ -83,9 +163,12 @@ function find_core_update( $version, $locale ) { function core_update_footer( $msg = '' ) { if ( !current_user_can('update_core') ) - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); $cur = get_preferred_from_update_core(); + if ( ! is_object( $cur ) ) + $cur = new stdClass; + if ( ! isset( $cur->current ) ) $cur->current = ''; @@ -97,7 +180,7 @@ function core_update_footer( $msg = '' ) { switch ( $cur->response ) { case 'development' : - return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) ); + return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) ); break; case 'upgrade' : @@ -106,7 +189,7 @@ function core_update_footer( $msg = '' ) { case 'latest' : default : - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); break; } } @@ -134,10 +217,16 @@ function update_nag() { echo "$msg
"; } function get_plugin_updates() { @@ -201,21 +290,47 @@ function wp_plugin_update_row( $file, $plugin_data ) { else printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) ); - do_action( "in_plugin_update_message-$file", $plugin_data, $r ); + /** + * Fires at the end of the update message container in each + * row of the plugins list table. + * + * The dynamic portion of the hook name, $file, refers to the path + * of the plugin's primary file relative to the plugins directory. + * + * @since 2.8.0 + * + * @param array $plugin_data { + * An array of plugin metadata. + * + * @type string $name The human-readable name of the plugin. + * @type string $plugin_uri Plugin URI. + * @type string $version Plugin version. + * @type string $description Plugin description. + * @type string $author Plugin author. + * @type string $author_uri Plugin author URI. + * @type string $text_domain Plugin text domain. + * @type string $domain_path Relative path to the plugin's .mo file(s). + * @type bool $network Whether the plugin can only be activated network wide. + * @type string $title The human-readable title of the plugin. + * @type string $author_name Plugin author's name. + * @type bool $update Whether there's an available update. Default null. + * } + * @param array $r { + * An array of metadata about the available plugin update. + * + * @type int $id Plugin ID. + * @type string $slug Plugin slug. + * @type string $new_version New plugin version. + * @type string $url Plugin URL. + * @type string $package Plugin update package URL. + * } + */ + do_action( "in_plugin_update_message-{$file}", $plugin_data, $r ); echo ''; } } -function wp_update_plugin($plugin, $feedback = '') { - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - $upgrader = new Plugin_Upgrader(); - return $upgrader->upgrade($plugin); -} - function get_theme_updates() { $themes = wp_get_themes(); $current = get_site_transient('update_themes'); @@ -232,15 +347,6 @@ function get_theme_updates() { return $update_themes; } -function wp_update_theme($theme, $feedback = '') { - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - $upgrader = new Theme_Upgrader(); - return $upgrader->upgrade($theme); -} - function wp_theme_update_rows() { if ( !current_user_can('update_themes' ) ) return; @@ -276,24 +382,51 @@ function wp_theme_update_row( $theme_key, $theme ) { else printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) ); - do_action( "in_theme_update_message-$theme_key", $theme, $r ); + /** + * Fires at the end of the update message container in each + * row of the themes list table. + * + * The dynamic portion of the hook name, $theme_key, refers to + * the theme slug as found in the WordPress.org themes repository. + * + * @since 3.1.0 + * + * @param WP_Theme $theme The WP_Theme object. + * @param array $r { + * An array of metadata about the available theme update. + * + * @type string $new_version New theme version. + * @type string $url Theme URL. + * @type string $package Theme update package URL. + * } + */ + do_action( "in_theme_update_message-{$theme_key}", $theme, $r ); echo ''; } -function wp_update_core($current, $feedback = '') { - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - $upgrader = new Core_Upgrader(); - return $upgrader->upgrade($current); - -} - function maintenance_nag() { + include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version global $upgrading; - if ( ! isset( $upgrading ) ) + $nag = isset( $upgrading ); + if ( ! $nag ) { + $failed = get_site_option( 'auto_core_update_failed' ); + /* + * If an update failed critically, we may have copied over version.php but not other files. + * In that case, if the install claims we're running the version we attempted, nag. + * This is serious enough to err on the side of nagging. + * + * If we simply failed to update before we tried to copy any files, then assume things are + * OK if they are now running the latest. + * + * This flag is cleared whenever a successful update occurs using Core_Upgrader. + */ + $comparison = ! empty( $failed['critical'] ) ? '>=' : '>'; + if ( version_compare( $failed['attempted'], $wp_version, $comparison ) ) + $nag = true; + } + + if ( ! $nag ) return false; if ( current_user_can('update_core') ) @@ -304,3 +437,4 @@ function maintenance_nag() { echo "The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickies to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.+
The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.As a new WordPress user, you should go to your dashboard to delete this page and create new pages for your content. Have fun!" ), admin_url() ); if ( is_multisite() ) @@ -279,7 +227,7 @@ As a new WordPress user, you should go to your dashboard to d update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) ); update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) ); update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) ); - update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array ( ), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'sidebar-2' => array ( ), 'sidebar-3' => array ( ), 'sidebar-4' => array ( ), 'sidebar-5' => array ( ), 'array_version' => 3 ) ); + update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'sidebar-2' => array (), 'sidebar-3' => array (), 'array_version' => 3 ) ); if ( ! is_multisite() ) update_user_meta( $user_id, 'show_welcome_panel', 1 ); @@ -319,7 +267,7 @@ if ( !function_exists('wp_new_blog_notification') ) : * @param string $password User's Password. */ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) { - $user = new WP_User($user_id); + $user = new WP_User( $user_id ); $email = $user->user_email; $name = $user->user_login; $message = sprintf(__("Your new WordPress site has been successfully set up at: @@ -334,7 +282,7 @@ Password: %3\$s We hope you enjoy your new site. Thanks! --The WordPress Team -http://wordpress.org/ +https://wordpress.org/ "), $blog_url, $name, $password); @wp_mail($email, __('New WordPress Site'), $message); @@ -378,6 +326,16 @@ function wp_upgrade() { else $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" ); } + + /** + * Fires after a site is fully upgraded. + * + * @since 3.9.0 + * + * @param int $wp_db_version The new $wp_db_version. + * @param int $wp_current_db_version The old (current) $wp_db_version. + */ + do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version ); } endif; @@ -460,6 +418,20 @@ function upgrade_all() { if ( $wp_current_db_version < 20080 ) upgrade_340(); + if ( $wp_current_db_version < 22422 ) + upgrade_350(); + + if ( $wp_current_db_version < 25824 ) + upgrade_370(); + + if ( $wp_current_db_version < 26148 ) + upgrade_372(); + + if ( $wp_current_db_version < 26691 ) + upgrade_380(); + + maybe_disable_link_manager(); + maybe_disable_automattic_widgets(); update_option( 'db_version', $wp_db_version ); @@ -489,7 +461,7 @@ function upgrade_100() { foreach ($categories as $category) { if ('' == $category->category_nicename) { $newtitle = sanitize_title($category->cat_name); - $wpdb>update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) ); + $wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) ); } } @@ -567,11 +539,11 @@ function upgrade_110() { $time_difference = $all_options->time_difference; $server_time = time()+date('Z'); - $weblogger_time = $server_time + $time_difference*3600; + $weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS; $gmt_time = time(); - $diff_gmt_server = ($gmt_time - $server_time) / 3600; - $diff_weblogger_server = ($weblogger_time - $server_time) / 3600; + $diff_gmt_server = ($gmt_time - $server_time) / HOUR_IN_SECONDS; + $diff_weblogger_server = ($weblogger_time - $server_time) / HOUR_IN_SECONDS; $diff_gmt_weblogger = $diff_gmt_server - $diff_weblogger_server; $gmt_offset = -$diff_gmt_weblogger; @@ -692,23 +664,23 @@ function upgrade_160() { $users = $wpdb->get_results("SELECT * FROM $wpdb->users"); foreach ( $users as $user ) : if ( !empty( $user->user_firstname ) ) - update_user_meta( $user->ID, 'first_name', $wpdb->escape($user->user_firstname) ); + update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) ); if ( !empty( $user->user_lastname ) ) - update_user_meta( $user->ID, 'last_name', $wpdb->escape($user->user_lastname) ); + update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) ); if ( !empty( $user->user_nickname ) ) - update_user_meta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) ); + update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) ); if ( !empty( $user->user_level ) ) update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level ); if ( !empty( $user->user_icq ) ) - update_user_meta( $user->ID, 'icq', $wpdb->escape($user->user_icq) ); + update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) ); if ( !empty( $user->user_aim ) ) - update_user_meta( $user->ID, 'aim', $wpdb->escape($user->user_aim) ); + update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) ); if ( !empty( $user->user_msn ) ) - update_user_meta( $user->ID, 'msn', $wpdb->escape($user->user_msn) ); + update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) ); if ( !empty( $user->user_yim ) ) - update_user_meta( $user->ID, 'yim', $wpdb->escape($user->user_icq) ); + update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) ); if ( !empty( $user->user_description ) ) - update_user_meta( $user->ID, 'description', $wpdb->escape($user->user_description) ); + update_user_meta( $user->ID, 'description', wp_slash($user->user_description) ); if ( isset( $user->user_idmode ) ): $idmode = $user->user_idmode; @@ -910,7 +882,7 @@ function upgrade_230() { foreach ( $link_cats as $category) { $cat_id = (int) $category->cat_id; $term_id = 0; - $name = $wpdb->escape($category->cat_name); + $name = wp_slash($category->cat_name); $slug = sanitize_title($name); $term_group = 0; @@ -1050,11 +1022,6 @@ function upgrade_260() { if ( $wp_current_db_version < 8000 ) populate_roles_260(); - - if ( $wp_current_db_version < 8201 ) { - update_option('enable_app', 1); - update_option('enable_xmlrpc', 1); - } } /** @@ -1242,6 +1209,67 @@ function upgrade_340() { } } +/** + * Execute changes made in WordPress 3.5. + * + * @since 3.5.0 + */ +function upgrade_350() { + global $wp_current_db_version, $wpdb; + + if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) + update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options() + + if ( $wp_current_db_version < 21811 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + $meta_keys = array(); + foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) { + if ( false !== strpos( $name, '-' ) ) + $meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page'; + } + if ( $meta_keys ) { + $meta_keys = implode( "', '", $meta_keys ); + $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')" ); + } + } + + if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) + wp_delete_term( $term->term_id, 'post_format' ); +} + +/** + * Execute changes made in WordPress 3.7. + * + * @since 3.7.0 + */ +function upgrade_370() { + global $wp_current_db_version; + if ( $wp_current_db_version < 25824 ) + wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' ); +} + +/** + * Execute changes made in WordPress 3.7.2. + * + * @since 3.7.2 + * @since 3.8.0 + */ +function upgrade_372() { + global $wp_current_db_version; + if ( $wp_current_db_version < 26148 ) + wp_clear_scheduled_hook( 'wp_maybe_auto_update' ); +} + +/** + * Execute changes made in WordPress 3.8.0. + * + * @since 3.8.0 + */ +function upgrade_380() { + global $wp_current_db_version; + if ( $wp_current_db_version < 26691 ) { + deactivate_plugins( array( 'mp6/mp6.php' ), true ); + } +} /** * Execute network level changes * @@ -1249,6 +1277,20 @@ function upgrade_340() { */ function upgrade_network() { global $wp_current_db_version, $wpdb; + + // Always + if ( is_main_network() ) { + // Deletes all expired transients. + // The multi-table delete syntax is used to delete the transient record from table a, + // and the corresponding transient_timeout record from table b. + $time = time(); + $wpdb->query("DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b WHERE + a.meta_key LIKE '\_site\_transient\_%' AND + a.meta_key NOT LIKE '\_site\_transient\_timeout\_%' AND + b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) ) + AND b.meta_value < $time"); + } + // 2.8 if ( $wp_current_db_version < 11549 ) { $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' ); @@ -1307,6 +1349,20 @@ function upgrade_network() { delete_site_option( 'allowed_themes' ); } } + + // 3.5 + if ( $wp_current_db_version < 21823 ) + update_site_option( 'ms_files_rewriting', '1' ); + + // 3.5.2 + if ( $wp_current_db_version < 24448 ) { + $illegal_names = get_site_option( 'illegal_names' ); + if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) { + $illegal_name = reset( $illegal_names ); + $illegal_names = explode( ' ', $illegal_name ); + update_site_option( 'illegal_names', $illegal_names ); + } + } } // The functions we use to actually do stuff @@ -1447,11 +1503,7 @@ function __get_option($setting) { if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) $option = untrailingslashit( $option ); - @ $kellogs = unserialize( $option ); - if ( $kellogs !== false ) - return $kellogs; - else - return $option; + return maybe_unserialize( $option ); } /** @@ -1503,6 +1555,14 @@ function dbDelta( $queries = '', $execute = true ) { $queries = explode( ';', $queries ); $queries = array_filter( $queries ); } + + /** + * Filter the dbDelta SQL queries. + * + * @since 3.3.0 + * + * @param array $queries An array of dbDelta SQL queries. + */ $queries = apply_filters( 'dbdelta_queries', $queries ); $cqueries = array(); // Creation Queries @@ -1524,19 +1584,41 @@ function dbDelta( $queries = '', $execute = true ) { // Unrecognized query type } } + + /** + * Filter the dbDelta SQL queries for creating tables and/or databases. + * + * Queries filterable via this hook contain "CREATE TABLE" or "CREATE DATABASE". + * + * @since 3.3.0 + * + * @param array $cqueries An array of dbDelta create SQL queries. + */ $cqueries = apply_filters( 'dbdelta_create_queries', $cqueries ); + + /** + * Filter the dbDelta SQL queries for inserting or updating. + * + * Queries filterable via this hook contain "INSERT INTO" or "UPDATE". + * + * @since 3.3.0 + * + * @param array $iqueries An array of dbDelta insert or update SQL queries. + */ $iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries ); $global_tables = $wpdb->tables( 'global' ); foreach ( $cqueries as $table => $qry ) { // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined. - if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) ) + if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) ) { + unset( $cqueries[ $table ], $for_update[ $table ] ); continue; + } // Fetch the table column structure from the database - $wpdb->suppress_errors(); + $suppress = $wpdb->suppress_errors(); $tablefields = $wpdb->get_results("DESCRIBE {$table};"); - $wpdb->suppress_errors( false ); + $wpdb->suppress_errors( $suppress ); if ( ! $tablefields ) continue; @@ -1596,7 +1678,7 @@ function dbDelta( $queries = '', $execute = true ) { // Get the default value from the array //echo "{$cfields[strtolower($tablefield->Field)]}
'; - printf( '' . __('Yes, take me to my profile page') . ' | ', admin_url('profile.php') . '#password' ); + printf( '' . __('Yes, take me to my profile page') . ' | ', get_edit_profile_url() . '#password' ); printf( '' . __('No thanks, do not remind me again') . '', '?default_password_nag=0' ); echo '
'; } diff --git a/wordpress/wp-admin/includes/widgets.php b/wordpress/wp-admin/includes/widgets.php index 318cf3f..0a86815 100644 --- a/wordpress/wp-admin/includes/widgets.php +++ b/wordpress/wp-admin/includes/widgets.php @@ -58,27 +58,40 @@ function _sort_name_callback( $a, $b ) { /** * Show the widgets and their settings for a sidebar. - * Used in the the admin widget config screen. + * Used in the admin widget config screen. * * @since 2.5.0 * * @param string $sidebar id slug of the sidebar + * @param string optional $sidebar_name Include the HTML for the sidebar name */ -function wp_list_widget_controls( $sidebar ) { +function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' ); - echo "\n"; + + echo ''; } /** @@ -179,7 +192,11 @@ function wp_widget_control( $sidebar_args ) { @@ -207,8 +224,8 @@ function wp_widget_control( $sidebar_args ) { ); ?>)
- 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+ 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+
' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '
'; // Not using chaining here, so as to be parseable by PHP4. @@ -45,47 +42,42 @@ $screen->add_help_tab( array( // Help tabs -$help = '' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '
'; -$help .= '' . __('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '
'; +$help = '' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '
'; +$help .= '' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '
'; $screen->add_help_tab( array( 'id' => 'help-navigation', - 'title' => __('Navigation'), + 'title' => __( 'Navigation' ), 'content' => $help, ) ); -$help = '' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '
'; -$help .= '' . __('Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '
'; -$help .= '' . __('Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '
'; -$help .= '' . __('Box Controls - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a “Configure” link in the title bar if you hover over it.') . '
'; +$help = '' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '
'; +$help .= '' . __( 'Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '
'; +$help .= '' . __( 'Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '
'; +$help .= '' . __( 'Box Controls - Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it.' ) . '
'; $screen->add_help_tab( array( 'id' => 'help-layout', - 'title' => __('Layout'), + 'title' => __( 'Layout' ), 'content' => $help, ) ); -$help = '' . __('The boxes on your Dashboard screen are:') . '
'; +$help = '' . __( 'The boxes on your Dashboard screen are:' ) . '
'; if ( current_user_can( 'edit_posts' ) ) - $help .= '' . __('Right Now - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '
'; -if ( current_user_can( 'moderate_comments' ) ) - $help .= '' . __('Recent Comments - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '
'; -if ( current_user_can( 'publish_posts' ) ) - $help .= '' . __('Incoming Links - Shows links to your site found by Google Blog Search.') . '
'; -if ( current_user_can( 'edit_posts' ) ) { - $help .= '' . __('QuickPress - Allows you to create a new post and either publish it or save it as a draft.') . '
'; - $help .= '' . __('Recent Drafts - Displays links to the 5 most recent draft posts you’ve started.') . '
'; -} -$help .= '' . __('WordPress Blog - Latest news from the official WordPress project.') . '
'; -$help .= '' . __('Other WordPress News - Shows the WordPress Planet feed. You can configure it to show a different feed of your choosing.') . '
'; + $help .= '' . __( 'At A Glance - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '
'; + $help .= '' . __( 'Activity - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '
'; +if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) + $help .= '' . __( "Quick Draft - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '
'; if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) - $help .= '' . __('Plugins - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '
'; + $help .= '' . __( 'WordPress News - Latest news from the official WordPress project, the WordPress Planet, and popular and recent plugins.' ) . '
'; +else + $help .= '' . __( 'WordPress News - Latest news from the official WordPress project, the WordPress Planet.' ) . '
'; if ( current_user_can( 'edit_theme_options' ) ) - $help .= '' . __('Welcome - Shows links for some of the most common tasks when setting up a new site.') . '
'; + $help .= '' . __( 'Welcome - Shows links for some of the most common tasks when setting up a new site.' ) . '
'; $screen->add_help_tab( array( 'id' => 'help-content', - 'title' => __('Content'), + 'title' => __( 'Content' ), 'content' => $help, ) ); @@ -94,27 +86,46 @@ unset( $help ); $screen->set_help_sidebar( '' . __( 'For more information:' ) . '
' . '' . __( 'Documentation on Dashboard' ) . '
' . - '' . __( 'Support Forums' ) . '
' + '' . __( 'Support Forums' ) . '
' ); -include (ABSPATH . 'wp-admin/admin-header.php'); - -$today = current_time('mysql', 1); +include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.
@@ -36,10 +36,10 @@ define( 'WP_INSTALLING', true ); require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); /** Load WordPress Administration Upgrade API */ -require_once( dirname( __FILE__ ) . '/includes/upgrade.php' ); +require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); /** Load wpdb */ -require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php'); +require_once( ABSPATH . 'wp-includes/wp-db.php' ); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; @@ -47,8 +47,6 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; * Display install header. * * @since 2.5.0 - * @package WordPress - * @subpackage Installer */ function display_header() { header( 'Content-Type: text/html; charset=utf-8' ); @@ -56,12 +54,15 @@ function display_header() { > +' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '
' ); + die( '' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '