WordPress.org

Make WordPress Core


Ignore:
Timestamp:
12/03/2016 05:41:52 AM (3 years ago)
Author:
nacin
Message:

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

Merges [39470] and [39471] to the 4.7 branch.

fixes #38990.

Location:
branches/4.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

  • branches/4.7/tests/phpunit/tests/rest-api/rest-settings-controller.php

    r39469 r39472  
    5555            'title',
    5656            'description',
    57             'url',
    58             'email',
    5957            'timezone',
    6058            'date_format',
     
    7068        );
    7169
    72         if ( is_multisite() ) {
    73             $expected = array_diff( $expected, array( 'url' ) );
     70        if ( ! is_multisite() ) {
     71            $expected[] = 'url';
     72            $expected[] = 'email';
    7473        }
    7574
Note: See TracChangeset for help on using the changeset viewer.