diff --git a/wp-activate.php b/wp-activate.php index b13279af..1a7d1ecd 100644 --- a/wp-activate.php +++ b/wp-activate.php @@ -36,7 +36,7 @@ * * Fires on {@see 'wp_head'}. * - * @since MU + * @since MU (3.0.0) */ function do_activate_header() { /** @@ -53,7 +53,7 @@ function do_activate_header() { /** * Loads styles specific to this page. * - * @since MU + * @since MU (3.0.0) */ function wpmu_activate_stylesheet() { ?> @@ -108,10 +108,9 @@ function wpmu_activate_stylesheet() { ); } else { printf( - /* translators: 1: site URL, 2: site domain, 3: username, 4: user email, 5: lost password URL */ - __( 'Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.' ), - 'http://' . $signup->domain, - $signup->domain, + /* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */ + __( 'Your site at %1$s is active. You may now log in to your site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.' ), + sprintf( '%s', $signup->domain ), $signup->user_login, $signup->user_email, wp_lostpassword_url() diff --git a/wp-admin/about.php b/wp-admin/about.php index 8e7b2ef8..ab5a3510 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -9,21 +9,7 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! wp_is_mobile() ) { - wp_enqueue_style( 'wp-mediaelement' ); - wp_enqueue_script( 'wp-mediaelement' ); - wp_localize_script( 'mediaelement', '_wpmejsSettings', array( - 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ), - 'pauseOtherPlayers' => '', - ) ); -} - -$video_url = 'https://videopress.com/embed/AHz0Ca46?hd=true'; -$lang_code = str_replace( '_', '-', get_user_locale() ); -list( $lang_code ) = explode( '-', $lang_code ); -if ( 'en' !== $lang_code ) { - $video_url = add_query_arg( 'defaultLangCode', $lang_code, $video_url ); -} +wp_enqueue_script( 'underscore' ); $title = __( 'About' ); @@ -31,163 +17,197 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -
Version %1$s addressed some security issues and fixed %2$s bug.', - 'Version %1$s addressed some security issues and fixed %2$s bugs.', 1 ), '4.8.4', number_format_i18n( 1 ) ); ?> - the release notes.' ), 'https://codex.wordpress.org/Version_4.8.4' ); ?> -
-Version %s addressed one security issue.' ), '4.8.3' ); ?> - the release notes.' ), 'https://codex.wordpress.org/Version_4.8.3' ); ?> -
-Version %1$s addressed some security issues and fixed %2$s bug.', - 'Version %1$s addressed some security issues and fixed %2$s bugs.', 5 ), '4.8.2', number_format_i18n( 5 ) ); ?> - the release notes.' ), 'https://codex.wordpress.org/Version_4.8.2' ); ?> -
-Version %1$s addressed %2$s bug.', - 'Version %1$s addressed %2$s bugs.', 29 ), '4.8.1', number_format_i18n( 29 ) ); ?> - the release notes.' ), 'https://codex.wordpress.org/Version_4.8.1' ); ?> +
+ Version %1$s addressed some security issues and fixed %2$s bug.', + 'Version %1$s addressed some security issues and fixed %2$s bugs.', + 11 + ), + '4.9.1', + number_format_i18n( 11 ) + ); + ?> + the release notes.' ), 'https://codex.wordpress.org/Version_4.9.1' ); + ?>
you in mind. Get ready for new features you’ll welcome like an old friend: link improvements, three new media widgets covering images, audio, and video, an updated text widget that supports visual editing, and an upgraded news section in your dashboard which brings in nearby and upcoming WordPress events.' ); ?>
++
-
early tester or getting involved with the Gutenberg project? Contribute on GitHub.' ), + __( 'https://wordpress.org/plugins/gutenberg/' ), + 'https://github.com/WordPress/gutenberg' ); ?>
' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '
', 403 ); } - if ( in_array( get_post_status( $wp_customize->changeset_post_id() ), array( 'publish', 'trash' ), true ) ) { + + $missed_schedule = ( + 'future' === $changeset_post->post_status && + get_post_time( 'G', true, $changeset_post ) < time() + ); + if ( $missed_schedule ) { + /* + * Note that an Ajax request spawns here instead of just calling `wp_publish_post( $changeset_post->ID )`. + * + * Because WP_Customize_Manager is not instantiated for customize.php with the `settings_previewed=false` + * argument, settings cannot be reliably saved. Some logic short-circuits if the current value is the + * same as the value being saved. This is particularly true for options via `update_option()`. + * + * By opening an Ajax request, this is avoided and the changeset is published. See #39221. + */ + $nonces = $wp_customize->get_nonces(); + $request_args = array( + 'nonce' => $nonces['save'], + 'customize_changeset_uuid' => $wp_customize->changeset_uuid(), + 'wp_customize' => 'on', + 'customize_changeset_status' => 'publish', + ); + ob_start(); + ?> + + + ' . __( 'Your scheduled changes just published' ) . '' . + '' . __( 'Customize New Changes' ) . '
' . $script, + 200 + ); + } + + if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) { wp_die( '' . __( 'This changeset has already been published and cannot be further modified.' ) . '
' . @@ -71,6 +111,7 @@ */ do_action( 'customize_controls_init' ); +wp_enqueue_script( 'heartbeat' ); wp_enqueue_script( 'customize-controls' ); wp_enqueue_style( 'customize-controls' ); @@ -109,7 +150,8 @@ ?>