enmi-conf.org: comparison wp/wp-admin/includes/update.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 *
 * @return object|array|false The response from the API on success, false on failure.
 */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
 	if ( ! is_array( $updates ) ) {
 		return false;
 	}
 	if ( empty( $updates ) ) {
 		return (object) array( 'response' => 'latest' );
 	}
 	return $updates[0];
 }
 /**
 * Gets 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|false Array of the update objects on success, false on failure.
 */
 function get_core_updates( $options = array() ) {
-	$options   = array_merge(
+	$options = array_merge(
 		array(
 			'available' => true,
 			'dismissed' => false,
 		),
 		$options
 	);
 	$dismissed = get_site_option( 'dismissed_update_core' );
 	if ( ! is_array( $dismissed ) ) {
 		$dismissed = array();
 	}
 		return false;
 	}
 	$updates = $from_api->updates;
 	$result  = array();
 	foreach ( $updates as $update ) {
 		if ( 'autoupdate' === $update->response ) {
 			continue;
 		}
 				$update->dismissed = false;
 				$result[]          = $update;
 			}
 		}
 	}
 	return $result;
 }
 /**
 * Gets the best available (and enabled) Auto-Update for WordPress core.
 *
 * @return object|false The core update offering on success, false on failure.
 */
 function find_core_auto_update() {
 	$updates = get_site_transient( 'update_core' );
 	if ( ! $updates || empty( $updates->updates ) ) {
 		return false;
 	}
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$auto_update = false;
-	$upgrader    = new WP_Automatic_Updater;
+	$upgrader    = new WP_Automatic_Updater();
 	foreach ( $updates->updates as $update ) {
 		if ( 'autoupdate' !== $update->response ) {
 			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.
 function get_core_checksums( $version, $locale ) {
 	$http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
 	$url      = $http_url;
 	$ssl = wp_http_supports( array( 'ssl' ) );
 	if ( $ssl ) {
 		$url = set_url_scheme( $url, 'https' );
 	}
 	$options = array(
 		'timeout' => wp_doing_cron() ? 30 : 3,
 	);
 	$response = wp_remote_get( $url, $options );
 	if ( $ssl && is_wp_error( $response ) ) {
-		trigger_error(
+		wp_trigger_error(
+			__FUNCTION__,
 			sprintf(
 				/* translators: %s: Support forums URL. */
 				__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
 				__( 'https://wordpress.org/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 ) ) {
+	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 );
 * @return bool
 */
 function dismiss_core_update( $update ) {
 	$dismissed = get_site_option( 'dismissed_update_core' );
 	$dismissed[ $update->current . '|' . $update->locale ] = true;
 	return update_site_option( 'dismissed_update_core', $dismissed );
 }
 /**
 * Undismisses core update.
 	if ( ! isset( $dismissed[ $key ] ) ) {
 		return false;
 	}
 	unset( $dismissed[ $key ] );
 	return update_site_option( 'dismissed_update_core', $dismissed );
 }
 /**
 * Finds the available update for WordPress core.
 	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
 		return false;
 	}
 	$updates = $from_api->updates;
 	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale ) {
+		if ( $update->current === $version && $update->locale === $locale ) {
 			return $update;
 		}
 	}
 	return false;
 }
 /**
+* Returns core update footer message.
+*
 * @since 2.3.0
 *
 * @param string $msg
 * @return string
 */
 		/* translators: %s: WordPress version. */
 		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 	$cur = get_preferred_from_update_core();
 	if ( ! is_object( $cur ) ) {
-		$cur = new stdClass;
+		$cur = new stdClass();
 	}
 	if ( ! isset( $cur->current ) ) {
 		$cur->current = '';
 	}
 			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 }
 /**
+* Returns core update notification message.
+*
 * @since 2.3.0
 *
 * @global string $pagenow The filename of the current screen.
 * @return void|false
 */
 		return false;
 	}
 	$version_url = sprintf(
 		/* translators: %s: WordPress version. */
-		esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+		esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
 		sanitize_title( $cur->current )
 	);
 	if ( current_user_can( 'update_core' ) ) {
 		$msg = sprintf(
 			$version_url,
 			$cur->current
 		);
 	}
-	echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
+	wp_admin_notice(
+		$msg,
+		array(
+			'type'               => 'warning',
+			'additional_classes' => array( 'update-nag', 'inline' ),
+			'paragraph_wrap'     => false,
+		)
+	);
 }
 /**
 * Displays WordPress version and active theme in the 'At a Glance' dashboard widget.
 *
 * @since 2.5.0
 */
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
 	if ( current_user_can( 'switch_themes' ) ) {
 		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
 	}
 	$msg = '';
 	echo "<p id='wp-version-message'>$msg</p>";
 }
 /**
+* Retrieves plugins with updates available.
+*
 * @since 2.9.0
 *
 * @return array
 */
 function get_plugin_updates() {
 	$all_plugins     = get_plugins();
 	$upgrade_plugins = array();
 	$current         = get_site_transient( 'update_plugins' );
 	foreach ( (array) $all_plugins as $plugin_file => $plugin_data ) {
 		if ( isset( $current->response[ $plugin_file ] ) ) {
 			$upgrade_plugins[ $plugin_file ]         = (object) $plugin_data;
 			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
 		}
 	return $upgrade_plugins;
 }
 /**
+* Adds a callback to display update information for plugins with updates available.
+*
 * @since 2.9.0
 */
 function wp_plugin_update_rows() {
 	if ( ! current_user_can( 'update_plugins' ) ) {
 		return;
 	}
 	$plugins = get_site_transient( 'update_plugins' );
 	if ( isset( $plugins->response ) && is_array( $plugins->response ) ) {
 		$plugins = array_keys( $plugins->response );
 		foreach ( $plugins as $plugin_file ) {
 			add_action( "after_plugin_row_{$plugin_file}", 'wp_plugin_update_row', 10, 2 );
 		}
 	}
 }
 * @param array  $plugin_data Plugin information.
 * @return void|false
 */
 function wp_plugin_update_row( $file, $plugin_data ) {
 	$current = get_site_transient( 'update_plugins' );
 	if ( ! isset( $current->response[ $file ] ) ) {
 		return false;
 	}
 	$response = $current->response[ $file ];
 		echo '</p></div></td></tr>';
 	}
 }
 /**
+* Retrieves themes with updates available.
+*
 * @since 2.9.0
 *
 * @return array
 */
 function get_theme_updates() {
 	if ( ! isset( $current->response ) ) {
 		return array();
 	}
 	$update_themes = array();
 	foreach ( $current->response as $stylesheet => $data ) {
 		$update_themes[ $stylesheet ]         = wp_get_theme( $stylesheet );
 		$update_themes[ $stylesheet ]->update = $data;
 	}
 	return $update_themes;
 }
 /**
+* Adds a callback to display update information for themes with updates available.
+*
 * @since 3.1.0
 */
 function wp_theme_update_rows() {
 	if ( ! current_user_can( 'update_themes' ) ) {
 		return;
 	}
 	$themes = get_site_transient( 'update_themes' );
 	if ( isset( $themes->response ) && is_array( $themes->response ) ) {
 		$themes = array_keys( $themes->response );
 		foreach ( $themes as $theme ) {
 			add_action( "after_theme_row_{$theme}", 'wp_theme_update_row', 10, 2 );
 	echo '</p></div></td></tr>';
 }
 /**
+* Displays maintenance nag HTML message.
+*
 * @since 2.7.0
 *
 * @global int $upgrading
+*
 * @return void|false
 */
 function maintenance_nag() {
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 	global $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 installation claims we're running the version we attempted, nag.
 		);
 	} else {
 		$msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
 	}
-	echo "<div class='update-nag notice notice-warning inline'>$msg</div>";
+	wp_admin_notice(
+		$msg,
+		array(
+			'type'               => 'warning',
+			'additional_classes' => array( 'update-nag', 'inline' ),
+			'paragraph_wrap'     => false,
+		)
+	);
 }
 /**
 * Prints the JavaScript templates for update admin notices.
+*
+* @since 4.6.0
 *
 * Template takes one argument with four values:
 *
 *     param {object} data {
 *         Arguments for admin notice.
 *         @type string id        ID of the notice.
 *         @type string className Class names for the notice.
 *         @type string message   The notice's message.
 *         @type string type      The type of update the notice is for. Either 'plugin' or 'theme'.
 *     }
-*
-* @since 4.6.0
 */
 function wp_print_admin_notice_templates() {
 	?>
 	<script id="tmpl-wp-updates-admin-notice" type="text/html">
 		<div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{{ data.message }}}</p></div>
 	</script>
 	<script id="tmpl-wp-bulk-updates-admin-notice" type="text/html">
-		<div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errors ) { #>notice-error<# } else { #>notice-success<# } #>">
+		<div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errorMessage ) { #>notice-error<# } else { #>notice-success<# } #>">
 			<p>
-				<# if ( data.successes ) { #>
+				<# if ( data.successMessage ) { #>
-					<# if ( 1 === data.successes ) { #>
+					{{{ data.successMessage }}}
-						<# if ( 'plugin' === data.type ) { #>
+				<# } #>
+				<# if ( data.errorMessage ) { #>
+					<button class="button-link bulk-action-errors-collapsed" aria-expanded="false">
+						{{{ data.errorMessage }}}
+						<span class="screen-reader-text">
 							<?php
-							/* translators: %s: Number of plugins. */
+							/* translators: Hidden accessibility text. */
-							printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
+							_e( 'Show more details' );
 							?>
-						<# } else { #>
+						</span>
-							<?php
-							/* translators: %s: Number of themes. */
-							printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
-							?>
-						<# } #>
-					<# } else { #>
-						<# if ( 'plugin' === data.type ) { #>
-							<?php
-							/* translators: %s: Number of plugins. */
-							printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
-							?>
-						<# } else { #>
-							<?php
-							/* translators: %s: Number of themes. */
-							printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
-							?>
-						<# } #>
-					<# } #>
-				<# } #>
-				<# if ( data.errors ) { #>
-					<button class="button-link bulk-action-errors-collapsed" aria-expanded="false">
-						<# if ( 1 === data.errors ) { #>
-							<?php
-							/* translators: %s: Number of failed updates. */
-							printf( __( '%s update failed.' ), '{{ data.errors }}' );
-							?>
-						<# } else { #>
-							<?php
-							/* translators: %s: Number of failed updates. */
-							printf( __( '%s updates failed.' ), '{{ data.errors }}' );
-							?>
-						<# } #>
-						<span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				<# } #>
 			</p>
-			<# if ( data.errors ) { #>
+			<# if ( data.errorMessages ) { #>
 				<ul class="bulk-action-errors hidden">
 					<# _.each( data.errorMessages, function( errorMessage ) { #>
 						<li>{{ errorMessage }}</li>
 					<# } ); #>
 				</ul>
 }
 /**
 * Prints the JavaScript templates for update and deletion rows in list tables.
 *
+* @since 4.6.0
+*
 * The update template takes one argument with four values:
 *
 *     param {object} data {
 *         Arguments for the update row
 *
 *         @type string slug    Plugin slug.
 *         @type string plugin  Plugin base name.
 *         @type string name    Plugin name.
 *         @type string colspan The number of table columns this row spans.
 *     }
-*
-* @since 4.6.0
 */
 function wp_print_update_row_templates() {
 	?>
 	<script id="tmpl-item-update-row" type="text/template">
 		<tr class="plugin-update-tr update" id="{{ data.slug }}-update" data-slug="{{ data.slug }}" <# if ( data.plugin ) { #>data-plugin="{{ data.plugin }}"<# } #>>
 	$url = wp_login_url();
 	$url = add_query_arg( 'action', WP_Recovery_Mode::EXIT_ACTION, $url );
 	$url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION );
-	?>
+	$message = sprintf(
-	<div class="notice notice-info">
+		/* translators: %s: Recovery Mode exit link. */
-		<p>
+		__( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
-			<?php
+		esc_url( $url )
-			printf(
+	);
-				/* translators: %s: Recovery Mode exit link. */
+	wp_admin_notice( $message, array( 'type' => 'info' ) );
-				__( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
-				esc_url( $url )
-			);
-			?>
-		</p>
-	</div>
-	<?php
 }
 /**
 * Checks whether auto-updates are enabled.
 *
 * @since 5.5.0
 *
-* @param string $type The type of update being checked: 'theme' or 'plugin'.
+* @param string $type The type of update being checked: Either 'theme' or 'plugin'.
 * @return bool True if auto-updates are enabled for `$type`, false otherwise.
 */
 function wp_is_auto_update_enabled_for_type( $type ) {
 	if ( ! class_exists( 'WP_Automatic_Updater' ) ) {
 		require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';
 /**
 * Checks whether auto-updates are forced for an item.
 *
 * @since 5.6.0
 *
-* @param string    $type   The type of update being checked: 'theme' or 'plugin'.
+* @param string    $type   The type of update being checked: Either 'theme' or 'plugin'.
 * @param bool|null $update Whether to update. The value of null is internally used
 *                          to detect whether nothing has hooked into this filter.
 * @param object    $item   The update offer.
 * @return bool True if auto-updates are forced for `$item`, false otherwise.
 */

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef