From 0c2a6184eba7003d2bbabf651640396924ea92b5 Mon Sep 17 00:00:00 2001
From: Rachel Baker <rachel@rachelbaker.me>
Date: Wed, 26 Oct 2016 13:45:47 +0000
Subject: [PATCH] REST API: Add constructor to the
 `WP_REST_Settings_Controller` class.

Provides consistency with the other API endpoint controller classes.

Props Soean.
Fixes #38429.
Built from https://develop.svn.wordpress.org/trunk@38954


git-svn-id: http://core.svn.wordpress.org/trunk@38897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../endpoints/class-wp-rest-settings-controller.php | 13 ++++++++++---
 wp-includes/version.php                             |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
index 474cd592fc..921360e3ee 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
@@ -3,11 +3,18 @@
 /**
  * Manage a WordPress site's settings.
  */
-
 class WP_REST_Settings_Controller extends WP_REST_Controller {
 
-	protected $rest_base = 'settings';
-	protected $namespace = 'wp/v2';
+	/**
+	 * Constructor.
+	 *
+	 * @since 4.7.0
+	 * @access public
+	 */
+	public function __construct() {
+		$this->namespace = 'wp/v2';
+		$this->rest_base = 'settings';
+	}
 
 	/**
 	 * Register the routes for the objects of the controller.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ff2ab76ed8..b4709fa781 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38953';
+$wp_version = '4.7-alpha-38954';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.