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

equal deleted inserted replaced

-:48c4eec2b7e6
+:8c2e4d02f4ef
 	 *     @type int    $user_id          The ID of the site owner.
 	 *     @type string $password         The password of the site owner, if their user account didn't already exist.
 	 *     @type string $password_message The explanatory message regarding the password.
 	 * }
 	 */
-	function wp_install( $blog_title, $user_name, $user_email, $is_public, $deprecated = '', $user_password = '', $language = '' ) {
+	function wp_install(
+		$blog_title,
+		$user_name,
+		$user_email,
+		$is_public,
+		$deprecated = '',
+		#[\SensitiveParameter]
+		$user_password = '',
+		$language = ''
+	) {
 		if ( ! empty( $deprecated ) ) {
 			_deprecated_argument( __FUNCTION__, '2.6.0' );
 		}
 		wp_check_mysql_version();
 		update_option( 'blogname', $blog_title );
 		update_option( 'admin_email', $user_email );
 		update_option( 'blog_public', $is_public );
 		// Freshness of site - in the future, this could get more specific about actions taken, perhaps.
-		update_option( 'fresh_site', 1 );
+		update_option( 'fresh_site', 1, false );
 		if ( $language ) {
 			update_option( 'WPLANG', $language );
 		}
 			__(
 				'Hi, this is a comment.
 To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
 Commenter avatars come from <a href="%s">Gravatar</a>.'
 			),
-			esc_url( __( 'https://en.gravatar.com/' ) )
+			/* translators: The localized Gravatar URL. */
+			esc_url( __( 'https://gravatar.com/' ) )
 		);
 		$wpdb->insert(
 			$wpdb->comments,
 			array(
 				'comment_post_ID'      => 1,
 			/*
 			 * Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)
 			 * TODO: Get previous_blog_id.
 			 */
-			if ( ! is_super_admin( $user_id ) && 1 != $user_id ) {
+			if ( ! is_super_admin( $user_id ) && 1 !== $user_id ) {
 				$wpdb->delete(
 					$wpdb->usermeta,
 					array(
 						'user_id'  => $user_id,
 						'meta_key' => $wpdb->base_prefix . '1_capabilities',
 	 * @param string $blog_url   Site URL.
 	 * @param int    $user_id    Administrator's user ID.
 	 * @param string $password   Administrator's password. Note that a placeholder message is
 	 *                           usually passed instead of the actual password.
 	 */
-	function wp_new_blog_notification( $blog_title, $blog_url, $user_id, $password ) {
+	function wp_new_blog_notification(
+		$blog_title,
+		$blog_url,
+		$user_id,
+		#[\SensitiveParameter]
+		$password
+	) {
 		$user      = new WP_User( $user_id );
 		$email     = $user->user_email;
 		$name      = $user->user_login;
 		$login_url = wp_login_url();
 	 *
 	 * Upgrades the database if needed during a site update.
 	 *
 	 * @since 2.1.0
 	 *
-	 * @global int  $wp_current_db_version The old (current) database version.
+	 * @global int $wp_current_db_version The old (current) database version.
-	 * @global int  $wp_db_version         The new database version.
+	 * @global int $wp_db_version         The new database version.
 	 */
 	function wp_upgrade() {
 		global $wp_current_db_version, $wp_db_version;
-		$wp_current_db_version = __get_option( 'db_version' );
+		$wp_current_db_version = (int) __get_option( 'db_version' );
 		// We are up to date. Nothing to do.
-		if ( $wp_db_version == $wp_current_db_version ) {
+		if ( $wp_db_version === $wp_current_db_version ) {
 			return;
 		}
 		if ( ! is_blog_installed() ) {
 			return;
 * @global int $wp_db_version         The new database version.
 */
 function upgrade_all() {
 	global $wp_current_db_version, $wp_db_version;
-	$wp_current_db_version = __get_option( 'db_version' );
+	$wp_current_db_version = (int) __get_option( 'db_version' );
 	// We are up to date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version ) {
+	if ( $wp_db_version === $wp_current_db_version ) {
 		return;
 	}
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty( $wp_current_db_version ) ) {
 		upgrade_640();
 	}
 	if ( $wp_current_db_version < 57155 ) {
 		upgrade_650();
+	}
+	if ( $wp_current_db_version < 58975 ) {
+		upgrade_670();
+	}
+	if ( $wp_current_db_version < 60421 ) {
+		upgrade_682();
 	}
 	maybe_disable_link_manager();
 	maybe_disable_automattic_widgets();
 	$allposts = $wpdb->get_results( "SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere" );
 	if ( $allposts ) :
 		foreach ( $allposts as $post ) {
 			// Check to see if it's already been imported.
 			$cat = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category ) );
-			if ( ! $cat && 0 != $post->post_category ) { // If there's no result.
+			if ( ! $cat && 0 !== (int) $post->post_category ) { // If there's no result.
 				$wpdb->insert(
 					$wpdb->post2cat,
 					array(
 						'post_id'     => $post->ID,
 						'category_id' => $post->post_category,
 /**
 * Execute changes made in WordPress 1.2.
 *
 * @ignore
 * @since 1.2.0
+* @since 6.8.0 User passwords are no longer hashed with md5.
 *
 * @global wpdb $wpdb WordPress database abstraction object.
 */
 function upgrade_110() {
 	global $wpdb;
 			$newname = sanitize_title( $user->user_nickname );
 			$wpdb->update( $wpdb->users, array( 'user_nicename' => $newname ), array( 'ID' => $user->ID ) );
 		}
 	}
-	$users = $wpdb->get_results( "SELECT ID, user_pass from $wpdb->users" );
-	foreach ( $users as $row ) {
-		if ( ! preg_match( '/^[A-Fa-f0-9]{32}$/', $row->user_pass ) ) {
-			$wpdb->update( $wpdb->users, array( 'user_pass' => md5( $row->user_pass ) ), array( 'ID' => $row->ID ) );
-		}
-	}
 	// Get the GMT offset, we'll use that later on.
 	$all_options = get_alloptions_110();
 	$time_difference = $all_options->time_difference;
-		$server_time = time() + gmdate( 'Z' );
+	$server_time    = time() + (int) gmdate( 'Z' );
-	$weblogger_time  = $server_time + $time_difference * HOUR_IN_SECONDS;
+	$weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
-	$gmt_time        = time();
+	$gmt_time       = time();
 	$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;
 	$wpdb->query( "UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'" );
 	// Some versions have multiple duplicate option_name rows with the same values.
 	$options = $wpdb->get_results( "SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name" );
 	foreach ( $options as $option ) {
-		if ( 1 != $option->dupes ) { // Could this be done in the query?
+		if ( $option->dupes > 1 ) { // Could this be done in the query?
 			$limit    = $option->dupes - 1;
 			$dupe_ids = $wpdb->get_col( $wpdb->prepare( "SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit ) );
 			if ( $dupe_ids ) {
 				$dupe_ids = implode( ',', $dupe_ids );
 				$wpdb->query( "DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)" );
 		// Associate links to categories.
 		$links = $wpdb->get_results( "SELECT link_id, link_category FROM $wpdb->links" );
 		if ( ! empty( $links ) ) {
 			foreach ( $links as $link ) {
-				if ( 0 == $link->link_category ) {
+				if ( 0 === (int) $link->link_category ) {
 					continue;
 				}
 				if ( ! isset( $link_cat_id_map[ $link->link_category ] ) ) {
 					continue;
 				}
 	if ( $wp_current_db_version < 11958 ) {
 		/*
 		 * Previously, setting depth to 1 would redundantly disable threading,
 		 * but now 2 is the minimum depth to avoid confusion.
 		 */
-		if ( get_option( 'thread_comments_depth' ) == '1' ) {
+		if ( 1 === (int) get_option( 'thread_comments_depth' ) ) {
 			update_option( 'thread_comments_depth', 2 );
 			update_option( 'thread_comments', 0 );
 		}
 	}
 }
 	if ( $wp_current_db_version < 20080 ) {
 		if ( 'yes' === $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
 			$uninstall_plugins = get_option( 'uninstall_plugins' );
 			delete_option( 'uninstall_plugins' );
-			add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
+			add_option( 'uninstall_plugins', $uninstall_plugins, null, false );
 		}
 	}
 }
 /**
 		if ( ! is_multisite() ) {
 			// Replace non-autoload option can_compress_scripts with autoload option, see #55270
 			$can_compress_scripts = get_option( 'can_compress_scripts', false );
 			if ( false !== $can_compress_scripts ) {
 				delete_option( 'can_compress_scripts' );
-				add_option( 'can_compress_scripts', $can_compress_scripts, '', 'yes' );
+				add_option( 'can_compress_scripts', $can_compress_scripts, '', true );
 			}
 		}
 	}
 }
 				"theme_mods_$stylesheet",
 				$wpdb->esc_like( 'theme_mods_' ) . '%'
 			)
 		);
-		$autoload = array_fill_keys( $theme_mods_options, 'no' );
+		$autoload = array_fill_keys( $theme_mods_options, false );
 		wp_set_option_autoload_values( $autoload );
+	}
+}
+/**
+* Executes changes made in WordPress 6.7.0.
+*
+* @ignore
+* @since 6.7.0
+*
+* @global int  $wp_current_db_version The old (current) database version.
+*/
+function upgrade_670() {
+	global $wp_current_db_version;
+	if ( $wp_current_db_version < 58975 ) {
+		$options = array(
+			'recently_activated',
+			'_wp_suggested_policy_text_has_changed',
+			'dashboard_widget_options',
+			'ftp_credentials',
+			'adminhash',
+			'nav_menu_options',
+			'wp_force_deactivated_plugins',
+			'delete_blog_hash',
+			'allowedthemes',
+			'recovery_keys',
+			'https_detection_errors',
+			'fresh_site',
+		);
+		wp_set_options_autoload( $options, false );
+	}
+}
+/**
+* Executes changes made in WordPress 6.8.2.
+*
+* @ignore
+* @since 6.8.2
+*
+* @global int $wp_current_db_version The old (current) database version.
+*/
+function upgrade_682() {
+	global $wp_current_db_version;
+	if ( $wp_current_db_version < 60421 ) {
+		// Upgrade Ping-O-Matic and Twingly to use HTTPS.
+		$ping_sites_value = get_option( 'ping_sites' );
+		$ping_sites_value = explode( "\n", $ping_sites_value );
+		$ping_sites_value = array_map(
+			function ( $url ) {
+				$url = trim( $url );
+				$url = sanitize_url( $url );
+				if (
+					str_ends_with( trailingslashit( $url ), '://rpc.pingomatic.com/' )
+					|| str_ends_with( trailingslashit( $url ), '://rpc.twingly.com/' )
+				) {
+					$url = set_url_scheme( $url, 'https' );
+				}
+				return $url;
+			},
+			$ping_sites_value
+		);
+		$ping_sites_value = array_filter( $ping_sites_value );
+		$ping_sites_value = implode( "\n", $ping_sites_value );
+		update_option( 'ping_sites', $ping_sites_value );
 	}
 }
 /**
 * Executes network-level upgrade routines.
 	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
 		if ( wp_should_upgrade_global_tables() ) {
 			$upgrade = false;
 			$indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
 			foreach ( $indexes as $index ) {
-				if ( 'domain_path' === $index->Key_name && 'domain' === $index->Column_name && 140 != $index->Sub_part ) {
+				if ( 'domain_path' === $index->Key_name && 'domain' === $index->Column_name && '140' !== $index->Sub_part ) {
 					$upgrade = true;
 					break;
 				}
 			}
 * @param string[]|string $queries Optional. The query to run. Can be multiple queries
 *                                 in an array, or a string of queries separated by
 *                                 semicolons. Default empty string.
 * @param bool            $execute Optional. Whether or not to execute the query right away.
 *                                 Default true.
-* @return array Strings containing the results of the various update queries.
+* @return string[] Strings containing the results of the various update queries.
 */
 function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
 	global $wpdb;
 	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
 				// Get the type without attributes, e.g. `int`.
 				$fieldtype_base = strtok( $fieldtype_without_parentheses, ' ' );
 				// Is actual field type different from the field type in query?
-				if ( $tablefield->Type != $fieldtype ) {
+				if ( $tablefield->Type !== $fieldtype ) {
 					$do_change = true;
 					if ( in_array( $fieldtype_lowercased, $text_fields, true ) && in_array( $tablefield_type_lowercased, $text_fields, true ) ) {
 						if ( array_search( $fieldtype_lowercased, $text_fields, true ) < array_search( $tablefield_type_lowercased, $text_fields, true ) ) {
 							$do_change = false;
 						}
 				}
 				// Get the default value from the array.
 				if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
 					$default_value = $matches[1];
-					if ( $tablefield->Default != $default_value ) {
+					if ( $tablefield->Default !== $default_value ) {
 						// Add a query to change the column's default value
 						$cqueries[] = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";
 						$for_update[ $table . '.' . $tablefield->Field ] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
 					}
 				// Add the index to the index data array.
 				$index_ary[ $keyname ]['columns'][]  = array(
 					'fieldname' => $tableindex->Column_name,
 					'subpart'   => $tableindex->Sub_part,
 				);
-				$index_ary[ $keyname ]['unique']     = ( 0 == $tableindex->Non_unique ) ? true : false;
+				$index_ary[ $keyname ]['unique']     = ( '0' === $tableindex->Non_unique ) ? true : false;
 				$index_ary[ $keyname ]['index_type'] = $tableindex->Index_type;
 			}
 			// For each actual index in the index array.
 			foreach ( $index_ary as $index_name => $index_data ) {
 		}
 	}
 	// Make the new site theme active.
 	$current_template = __get_option( 'template' );
-	if ( WP_DEFAULT_THEME == $current_template ) {
+	if ( WP_DEFAULT_THEME === $current_template ) {
 		update_option( 'template', $template );
 		update_option( 'stylesheet', $template );
 	}
 	return $template;
 }

changeset 22	8c2e4d02f4ef
parent 21	48c4eec2b7e6