Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-24 01:57:53 +01:00
Code Issues Projects Releases Wiki Activity

REST API: Site URL setting should not be present on multisite installations.

Browse Source 
The `siteurl` setting is registered and made available to the REST API. On a multisite installation, this setting is not configurable from the General Settings screen, but due to the above it is configurable from the REST API.

Props peterwilsoncc.
Fixes #39005.


Built from https://develop.svn.wordpress.org/trunk@39468


git-svn-id: http://core.svn.wordpress.org/trunk@39408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2016-12-03 05:16:44 +00:00
parent a5e9954f1d
commit d7e0ae883c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/option.php
View File

@ -1737,16 +1737,18 @@ function register_initial_settings() {
'description' => __( 'Site tagline.' ),
) );
register_setting( 'general', 'siteurl', array(
'show_in_rest' => array(
'name' => 'url',
'schema' => array(
'format' => 'uri',
if ( ! is_multisite() ) {
register_setting( 'general', 'siteurl', array(
'show_in_rest' => array(
'name' => 'url',
'schema' => array(
'format' => 'uri',
),
),
),
'type' => 'string',
'description' => __( 'Site URL.' ),
) );
'type' => 'string',
'description' => __( 'Site URL.' ),
) );
}
register_setting( 'general', 'admin_email', array(
'show_in_rest' => array(

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-alpha-39466';
$wp_version = '4.8-alpha-39468';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.