sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REST API: Register the admin_email setting in single site only. 

See [39470]. This time including unit test changes.

fixes #38990.


git-svn-id: https://develop.svn.wordpress.org/trunk@39471 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2016-12-03 05:40:04 +00:00
parent ceee0b78e1
commit 4b2cbf6ac3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/phpunit/tests/rest-api/rest-settings-controller.php
View File

@ -54,8 +54,6 @@ class WP_Test_REST_Settings_Controller extends WP_Test_REST_Controller_Testcase
$expected = array(
'title',
'description',
'url',
'email',
'timezone',
'date_format',
'time_format',
@ -69,8 +67,9 @@ class WP_Test_REST_Settings_Controller extends WP_Test_REST_Controller_Testcase
'default_comment_status',
);
if ( is_multisite() ) {
$expected = array_diff( $expected, array( 'url' ) );
if ( ! is_multisite() ) {
$expected[] = 'url';
$expected[] = 'email';
}
sort( $expected );