enmi-conf.org: comparison wp/wp-includes/option.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 *
 * In most cases non-string scalar and null values will be converted and returned
 * as string equivalents.
 *
 * Exceptions:
+*
 * 1. When the option has not been saved in the database, the `$default` value
 *    is returned if provided. If not, boolean `false` is returned.
-* 2. When one of the Options API filters is used: {@see 'pre_option_{$option}'},
+* 2. When one of the Options API filters is used: {@see 'pre_option_$option'},
-*    {@see 'default_option_{$option}'}, or {@see 'option_{$option}'}, the returned
+*    {@see 'default_option_$option'}, or {@see 'option_$option'}, the returned
 *    value may not match the expected type.
 * 3. When the option has just been saved in the database, and get_option()
 *    is used right after, non-string scalar and null values are not converted to
 *    string equivalents and the original type is returned.
 *
 * Examples:
 *
-* When adding options like this: `add_option( 'my_option_name', 'value' );`
+* When adding options like this: `add_option( 'my_option_name', 'value' )`
-* and then retrieving them with `get_option( 'my_option_name' );`, the returned
+* and then retrieving them with `get_option( 'my_option_name' )`, the returned
 * values will be:
 *
-* `false` returns `string(0) ""`
+*   - `false` returns `string(0) ""`
-* `true`  returns `string(1) "1"`
+*   - `true`  returns `string(1) "1"`
-* `0`     returns `string(1) "0"`
+*   - `0`     returns `string(1) "0"`
-* `1`     returns `string(1) "1"`
+*   - `1`     returns `string(1) "1"`
-* `'0'`   returns `string(1) "0"`
+*   - `'0'`   returns `string(1) "0"`
-* `'1'`   returns `string(1) "1"`
+*   - `'1'`   returns `string(1) "1"`
-* `null`  returns `string(0) ""`
+*   - `null`  returns `string(0) ""`
 *
 * When adding options with non-scalar values like
-* `add_option( 'my_array', array( false, 'str', null ) );`, the returned value
+* `add_option( 'my_array', array( false, 'str', null ) )`, the returned value
 * will be identical to the original as it is serialized before saving
 * it in the database:
 *
-*    array(3) {
+*     array(3) {
-*        [0] => bool(false)
+*         [0] => bool(false)
-*        [1] => string(3) "str"
+*         [1] => string(3) "str"
-*        [2] => NULL
+*         [2] => NULL
-*    }
+*     }
 *
 * @since 1.5.0
 *
 * @global wpdb $wpdb WordPress database abstraction object.
 *
 *               boolean `false` is returned.
 */
 function get_option( $option, $default = false ) {
 	global $wpdb;
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
 	if ( empty( $option ) ) {
 		return false;
 	}
 	/*
 	$core_options = array( 'site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
 	$core_options_in = "'" . implode( "', '", $core_options ) . "'";
 	$options         = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $network_id ) );
+	$data = array();
 	foreach ( $options as $option ) {
 		$key                = $option->meta_key;
 		$cache_key          = "{$network_id}:$key";
 		$option->meta_value = maybe_unserialize( $option->meta_value );
-		wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
+		$data[ $cache_key ] = $option->meta_value;
 	}
+	wp_cache_set_multiple( $data, 'site-options' );
 }
 /**
 * Updates the value of an option that was already added.
 *
 * @return bool True if the value was updated, false otherwise.
 */
 function update_option( $option, $value, $autoload = null ) {
 	global $wpdb;
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
 	if ( empty( $option ) ) {
 		return false;
 	}
 	/*
 	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.3.0' );
 	}
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
 	if ( empty( $option ) ) {
 		return false;
 	}
 	/*
 * @return bool True if the option was deleted, false otherwise.
 */
 function delete_option( $option ) {
 	global $wpdb;
-	$option = trim( $option );
+	if ( is_scalar( $option ) ) {
+		$option = trim( $option );
+	}
 	if ( empty( $option ) ) {
 		return false;
 	}
 	wp_protect_special_option( $option );
 	 *
 	 * @param string $transient Transient name.
 	 */
 	do_action( "delete_transient_{$transient}", $transient );
-	if ( wp_using_ext_object_cache() ) {
+	if ( wp_using_ext_object_cache() || wp_installing() ) {
 		$result = wp_cache_delete( $transient, 'transient' );
 	} else {
 		$option_timeout = '_transient_timeout_' . $transient;
 		$option         = '_transient_' . $transient;
 		$result         = delete_option( $option );
 	if ( false !== $pre ) {
 		return $pre;
 	}
-	if ( wp_using_ext_object_cache() ) {
+	if ( wp_using_ext_object_cache() || wp_installing() ) {
 		$value = wp_cache_get( $transient, 'transient' );
 	} else {
 		$transient_option = '_transient_' . $transient;
 		if ( ! wp_installing() ) {
 			// If option is not in alloptions, it is not autoloaded and thus has a timeout.
 	 * @param mixed  $value      New value of transient.
 	 * @param string $transient  Transient name.
 	 */
 	$expiration = apply_filters( "expiration_of_transient_{$transient}", $expiration, $value, $transient );
-	if ( wp_using_ext_object_cache() ) {
+	if ( wp_using_ext_object_cache() || wp_installing() ) {
 		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
 	} else {
 		$transient_timeout = '_transient_timeout_' . $transient;
 		$transient_option  = '_transient_' . $transient;
 	 *
 	 * @param string $transient Transient name.
 	 */
 	do_action( "delete_site_transient_{$transient}", $transient );
-	if ( wp_using_ext_object_cache() ) {
+	if ( wp_using_ext_object_cache() || wp_installing() ) {
 		$result = wp_cache_delete( $transient, 'site-transient' );
 	} else {
 		$option_timeout = '_site_transient_timeout_' . $transient;
 		$option         = '_site_transient_' . $transient;
 		$result         = delete_site_option( $option );
 	if ( false !== $pre ) {
 		return $pre;
 	}
-	if ( wp_using_ext_object_cache() ) {
+	if ( wp_using_ext_object_cache() || wp_installing() ) {
 		$value = wp_cache_get( $transient, 'site-transient' );
 	} else {
 		// Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
 		$no_timeout       = array( 'update_core', 'update_plugins', 'update_themes' );
 		$transient_option = '_site_transient_' . $transient;
 	 * @param mixed  $value      New value of site transient.
 	 * @param string $transient  Transient name.
 	 */
 	$expiration = apply_filters( "expiration_of_site_transient_{$transient}", $expiration, $value, $transient );
-	if ( wp_using_ext_object_cache() ) {
+	if ( wp_using_ext_object_cache() || wp_installing() ) {
 		$result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
 	} else {
 		$transient_timeout = '_site_transient_timeout_' . $transient;
 		$option            = '_site_transient_' . $transient;
 *
 * The settings registered here are primarily useful for the REST API, so this
 * does not encompass all settings available in WordPress.
 *
 * @since 4.7.0
+* @since 6.0.1 The `show_on_front`, `page_on_front`, and `page_for_posts` options were added.
 */
 function register_initial_settings() {
 	register_setting(
 		'general',
 		'blogname',
 			'default'      => 10,
 		)
 	);
 	register_setting(
+		'reading',
+		'show_on_front',
+		array(
+			'show_in_rest' => true,
+			'type'         => 'string',
+			'description'  => __( 'What to show on the front page' ),
+		)
+	);
+	register_setting(
+		'reading',
+		'page_on_front',
+		array(
+			'show_in_rest' => true,
+			'type'         => 'integer',
+			'description'  => __( 'The ID of the page that should be displayed on the front page' ),
+		)
+	);
+	register_setting(
+		'reading',
+		'page_for_posts',
+		array(
+			'show_in_rest' => true,
+			'type'         => 'integer',
+			'description'  => __( 'The ID of the page that should display the latest posts' ),
+		)
+	);
+	register_setting(
 		'discussion',
 		'default_ping_status',
 		array(
 			'show_in_rest' => array(
 				'schema' => array(
 /**
 * Registers a setting and its data.
 *
 * @since 2.7.0
+* @since 3.0.0 The `misc` option group was deprecated.
+* @since 3.5.0 The `privacy` option group was deprecated.
 * @since 4.7.0 `$args` can be passed to set flags on the setting, similar to `register_meta()`.
 * @since 5.5.0 `$new_whitelist_options` was renamed to `$new_allowed_options`.
 *              Please consider writing more inclusive code.
 *
 * @global array $new_allowed_options
 * @global array $wp_registered_settings
 *
 * @param string $option_group A settings group name. Should correspond to an allowed option key name.
 *                             Default allowed option key names include 'general', 'discussion', 'media',
-*                             'reading', 'writing', 'misc', 'options', and 'privacy'.
+*                             'reading', 'writing', and 'options'.
 * @param string $option_name The name of an option to sanitize and save.
 * @param array  $args {
 *     Data used to describe the setting when registered.
 *
 *     @type string     $type              The type of data associated with this setting.
 *              Please consider writing more inclusive code.
 *
 * @global array $new_allowed_options
 * @global array $wp_registered_settings
 *
-* @param string          $option_group The settings group name used during registration.
+* @param string   $option_group The settings group name used during registration.
-* @param string          $option_name  The name of the option to unregister.
+* @param string   $option_name  The name of the option to unregister.
-* @param callable|string $deprecated   Deprecated.
+* @param callable $deprecated   Optional. Deprecated.
 */
 function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 	global $new_allowed_options, $wp_registered_settings;
 	/*

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6