From fced238f3593c699460d230a833e308b687cd656 Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <aaron@jorb.in>
Date: Tue, 30 Jan 2024 14:25:08 +0000
Subject: [PATCH] Install: When populating options, maybe_serialize instead of
 always serialize.

Props xknown, peterwilsoncc, jorbin, desrosj.

Built from https://develop.svn.wordpress.org/trunk@57389


git-svn-id: http://core.svn.wordpress.org/trunk@56895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php | 6 ++----
 wp-includes/version.php      | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index d339af3b17..20648d7dde 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -599,14 +599,12 @@ function populate_options( array $options = array() ) {
 			$autoload = 'yes';
 		}
 
-		if ( is_array( $value ) ) {
-			$value = serialize( $value );
-		}
-
 		if ( ! empty( $insert ) ) {
 			$insert .= ', ';
 		}
 
+		$value = maybe_serialize( sanitize_option( $option, $value ) );
+
 		$insert .= $wpdb->prepare( '(%s, %s, %s)', $option, $value, $autoload );
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 528a2ec443..aeed653d10 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-alpha-57388';
+$wp_version = '6.5-alpha-57389';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.