WordPress.org

Make WordPress Core

Changeset 39472 for branches/4.7


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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

  • branches/4.7/src/wp-includes/option.php

    r39469 r39472  
    17511751    }
    17521752
    1753     register_setting( 'general', 'admin_email', array(
    1754         'show_in_rest' => array(
    1755             'name'    => 'email',
    1756             'schema'  => array(
    1757                 'format' => 'email',
     1753    if ( ! is_multisite() ) {
     1754        register_setting( 'general', 'admin_email', array(
     1755            'show_in_rest' => array(
     1756                'name'    => 'email',
     1757                'schema'  => array(
     1758                    'format' => 'email',
     1759                ),
    17581760            ),
    1759         ),
    1760         'type'         => 'string',
    1761         'description'  => is_multisite() ? __( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. The new address will not become active until confirmed.' ) : __( 'This address is used for admin purposes, like new user notification.' ),
    1762     ) );
     1761            'type'         => 'string',
     1762            'description'  => __( 'This address is used for admin purposes, like new user notification.' ),
     1763        ) );
     1764    }
    17631765
    17641766    register_setting( 'general', 'timezone_string', array(
  • 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.