WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: Use typed array notation for the `$options` parameter in some new functions. 

Follow-up to [56445], [56508], [57013].

Props tmatsuur.
Fixes #59904.
Built from https://develop.svn.wordpress.org/trunk@57110


git-svn-id: http://core.svn.wordpress.org/trunk@56621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-11-14 12:44:27 +00:00
parent 078ed1a3a6
commit 91334ba3ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/option.php
View File

@ -256,9 +256,11 @@ function get_option( $option, $default_value = false ) {
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
* @param array $options An array of option names to be loaded. * @param string[] $options An array of option names to be loaded.
*/ */
function wp_prime_option_caches( $options ) { function wp_prime_option_caches( $options ) {
global $wpdb;
$alloptions = wp_load_alloptions(); $alloptions = wp_load_alloptions();
$cached_options = wp_cache_get_multiple( $options, 'options' ); $cached_options = wp_cache_get_multiple( $options, 'options' );
$notoptions = wp_cache_get( 'notoptions', 'options' ); $notoptions = wp_cache_get( 'notoptions', 'options' );
@ -283,7 +285,6 @@ function wp_prime_option_caches( $options ) {
return; return;
} }
global $wpdb;
$results = $wpdb->get_results( $results = $wpdb->get_results(
$wpdb->prepare( $wpdb->prepare(
sprintf( sprintf(
@ -351,7 +352,7 @@ function wp_prime_option_caches_by_group( $option_group ) {
* *
* @since 6.4.0 * @since 6.4.0
* *
* @param array $options An array of option names to retrieve. * @param string[] $options An array of option names to retrieve.
* @return array An array of key-value pairs for the requested options. * @return array An array of key-value pairs for the requested options.
*/ */
function get_options( $options ) { function get_options( $options ) {
@ -498,7 +499,7 @@ function wp_set_option_autoload_values( array $options ) {
* *
* @see wp_set_option_autoload_values() * @see wp_set_option_autoload_values()
* *
* @param array $options List of option names. Expected to not be SQL-escaped. * @param string[] $options List of option names. Expected to not be SQL-escaped.
* @param string|bool $autoload Autoload value to control whether to load the options when WordPress starts up. * @param string|bool $autoload Autoload value to control whether to load the options when WordPress starts up.
* Accepts 'yes'|true to enable or 'no'|false to disable. * Accepts 'yes'|true to enable or 'no'|false to disable.
* @return array Associative array of all provided $options as keys and boolean values for whether their autoload value * @return array Associative array of all provided $options as keys and boolean values for whether their autoload value

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.5-alpha-57109'; $wp_version = '6.5-alpha-57110';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.