From 4b2cbf6ac37641046c5f72cdee0014ab44c99749 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 3 Dec 2016 05:40:04 +0000 Subject: [PATCH] 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 --- tests/phpunit/tests/rest-api/rest-settings-controller.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/tests/rest-api/rest-settings-controller.php b/tests/phpunit/tests/rest-api/rest-settings-controller.php index 9970e590df..21704a035c 100644 --- a/tests/phpunit/tests/rest-api/rest-settings-controller.php +++ b/tests/phpunit/tests/rest-api/rest-settings-controller.php @@ -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 );