From d1a84b6f2ea6228a2098a181c84a96cf5b730046 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 13 Jul 2015 20:49:24 +0000
Subject: [PATCH] Fix syntax and add missing `@access` tags to a variety of
 methods added to `WP_Customize_Section`, `WP_Customize_Nav_Menu_Section`, and
 `WP_Customize_New_Menu_Section` in 4.3.

See [32658] and [32806]. See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-section.php | 25 ++++++++++++++--------
 wp-includes/version.php                    |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/wp-includes/class-wp-customize-section.php b/wp-includes/class-wp-customize-section.php
index 82541878ba..d98d3bd35f 100644
--- a/wp-includes/class-wp-customize-section.php
+++ b/wp-includes/class-wp-customize-section.php
@@ -316,9 +316,12 @@ class WP_Customize_Section {
 	 * Render the section's JS template.
 	 *
 	 * This function is only run for section types that have been registered with
-	 * {@see WP_Customize_Manager::register_section_type()}.
+	 * WP_Customize_Manager::register_section_type().
 	 *
 	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Manager::render_template()
 	 */
 	public function print_template() {
         ?>
@@ -332,11 +335,12 @@ class WP_Customize_Section {
 	 * An Underscore (JS) template for rendering this section.
 	 *
 	 * Class variables for this section class are available in the `data` JS object;
-	 * export custom variables by overriding {@see WP_Customize_Section::json()}.
-	 *
-	 * @see WP_Customize_Section::print_template()
+	 * export custom variables by overriding WP_Customize_Section::json().
 	 *
 	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @see WP_Customize_Section::print_template()
 	 */
 	protected function render_template() {
 		?>
@@ -503,6 +507,8 @@ class WP_Customize_Sidebar_Section extends WP_Customize_Section {
  * Custom section only needed in JS.
  *
  * @since 4.3.0
+ *
+ * @see WP_Customize_Section
  */
 class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
 
@@ -510,18 +516,17 @@ class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 *
 	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu';
 
 	/**
-	 * Get section params for JS.
+	 * Get section parameters for JS.
 	 *
 	 * @since 4.3.0
-	 *
-	 * @return array
+	 * @access public
+	 * @return array Exported parameters.
 	 */
 	public function json() {
 		$exported = parent::json();
@@ -537,6 +542,8 @@ class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
  * Implements the new-menu-ui toggle button instead of a regular section.
  *
  * @since 4.3.0
+ *
+ * @see WP_Customize_Section
  */
 class WP_Customize_New_Menu_Section extends WP_Customize_Section {
 
@@ -544,7 +551,6 @@ class WP_Customize_New_Menu_Section extends WP_Customize_Section {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 *
 	 * @access public
 	 * @var string
 	 */
@@ -554,6 +560,7 @@ class WP_Customize_New_Menu_Section extends WP_Customize_Section {
 	 * Render the section, and the controls that have been added to it.
 	 *
 	 * @since 4.3.0
+	 * @access protected
 	 */
 	protected function render() {
 		?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 074ac14c3b..0e594485b9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta2-33219';
+$wp_version = '4.3-beta2-33220';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.