mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-13 08:32:10 +02:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Options, Meta APIs: Check setting group exists before search in unregister_setting().

Browse Source 
Checks if the given `$option_group` exists before searching for the `$option_name`. Sets the `$pos` to `false`, as `array_search()` returns `false` if the option name (needle) does not exist.

This changeset fixes 2 different PHP Warning|Notice scenarios:
1. When the global `$new_allowed_options` is `null`, fixes raising `Trying to access array offset on value of type null` PHP Notice (PHP 7.4) | Warning (on PHP 8).

2. When the global `$new_allowed_options` is an `array` and the setting group key does not exist, fixes raising "Undefined index: unknown_setting_group" PHP Notice (PHP 7) | Warning (on PHP 8).

For both scenarios, the `array_search()` is skipped and the `$pos` is set to a default of `false`, i.e. which is the value returned when `array_search()` is unsuccessful.

Props xknown, hellofromTonya, nicolefurlan, oglekler, SergeyBiryukov, shailu25.
Fixes #57674.

git-svn-id: https://develop.svn.wordpress.org/trunk@56817 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Tonya Mork 2023-10-10 12:50:19 +00:00
parent 33d1242992
commit 4984081ef6
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/option.php
View File

@ -2903,7 +2903,10 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
$option_group = 'reading';
}
$pos = array_search( $option_name, (array) $new_allowed_options[ $option_group ], true );
$pos = false;
if ( isset( $new_allowed_options[ $option_group ] ) ) {
$pos = array_search( $option_name, (array) $new_allowed_options[ $option_group ], true );
}
if ( false !== $pos ) {
unset( $new_allowed_options[ $option_group ][ $pos ] );

14
tests/phpunit/tests/option/registration.php
View File

@ -149,4 +149,18 @@ class Tests_Option_Registration extends WP_UnitTestCase {
$this->assertFalse( has_filter( 'default_option_test_default', 'filter_default_option' ) );
}
/**
* The test passes if a Notice | Warning | Error is not raised. Thus. the absence of a Notice | Warning | Error
* is an indicator the fix in the ticket resolves the issue.
*
* @ticket 57674
*
* @covers ::unregister_setting
*/
public function test_unregister_invalid_setting_does_not_raise_php_notice_warning_or_error() {
$setting = uniqid();
unregister_setting( $setting, $setting );
$this->assertFalse( has_filter( 'default_option_' . $setting, 'filter_default_option' ) );
}
}