From cde4c83091fff22c3aa0032425d0bc4b3c076954 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 16 Jan 2015 18:37:24 +0000
Subject: [PATCH] [31210] broke Supportflow on dotorg, which declares these
 methods as `protected`. Switch to `protected` for the noop methods. The
 subclasses can make them more visible using `public`.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-list-table.php  | 6 +++---
 wp-includes/capabilities.php               | 1 +
 wp-includes/class-wp-customize-manager.php | 4 ++--
 wp-includes/class-wp.php                   | 3 +--
 wp-includes/ms-deprecated.php              | 7 +++++--
 wp-includes/version.php                    | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index db3471f2e9..39a8bce185 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -1033,10 +1033,10 @@ class WP_List_Table {
 		echo '</tr>';
 	}
 
-	public function column_default( $item, $column_name ) {}
+	protected function column_default( $item, $column_name ) {}
+
+	protected function column_cb( $item ) {}
 
-	public function column_cb( $item ) {}
-	
 	/**
 	 * Generates the columns for a single row of the table
 	 *
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index aa3bb2af2f..641fd05dda 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -429,6 +429,7 @@ class WP_Role {
  * @property string $user_pass
  * @property string $user_registered
  * @property string $user_url
+ * @property string $spam
  */
 class WP_User {
 	/**
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index f388c53873..ccf58358ec 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -889,8 +889,8 @@ final class WP_Customize_Manager {
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $a Object A.
-	 * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $b Object B.
+	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $a Object A.
+	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $b Object B.
 	 * @return int
 	 */
 	protected function _cmp_priority( $a, $b ) {
diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 8f8f95dd12..a079c122d5 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -541,7 +541,7 @@ class WP {
  	}
 
  	/**
- 	 * Set the Headers for 404, if nothing is found for requested URL.
+	 * Set the Headers for 404, if nothing is found for requested URL.
 	 *
 	 * Issue a 404 if a request doesn't match any posts and doesn't match
 	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
@@ -666,7 +666,6 @@ class WP_MatchesMapRegex {
 	 *
 	 * @param string $subject subject if regex
 	 * @param array  $matches data to use in map
-	 * @return self
 	 */
 	public function __construct($subject, $matches) {
 		$this->_subject = $subject;
diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 1a0b253242..beae326fe1 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -194,15 +194,18 @@ function get_most_active_blogs( $num = 10, $display = true ) {
 	$blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
 	if ( is_array( $blogs ) ) {
 		reset( $blogs );
+		$most_active = array();
+		$blog_list = array();
 		foreach ( (array) $blogs as $key => $details ) {
 			$most_active[ $details['blog_id'] ] = $details['postcount'];
 			$blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
 		}
 		arsort( $most_active );
 		reset( $most_active );
-		foreach ( (array) $most_active as $key => $details )
+		$t = array();
+		foreach ( (array) $most_active as $key => $details ) {
 			$t[ $key ] = $blog_list[ $key ];
-
+		}
 		unset( $most_active );
 		$most_active = $t;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f7fbc5b8f6..00e1bf7189 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31210';
+$wp_version = '4.2-alpha-31211';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.