sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.

Browse Source 
See #30799.


git-svn-id: https://develop.svn.wordpress.org/trunk@31211 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-01-16 18:36:46 +00:00
parent e3ac341f24
commit 835dbe7baf
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/class-wp-list-table.php
View File

@ -1033,9 +1033,9 @@ class WP_List_Table {
echo '</tr>'; echo '</tr>';
} }
public function column_default( $item, $column_name ) {} protected function column_default( $item, $column_name ) {}
public function column_cb( $item ) {} protected function column_cb( $item ) {}
/** /**
* Generates the columns for a single row of the table * Generates the columns for a single row of the table

1
src/wp-includes/capabilities.php
View File

@ -429,6 +429,7 @@ class WP_Role {
* @property string $user_pass * @property string $user_pass
* @property string $user_registered * @property string $user_registered
* @property string $user_url * @property string $user_url
* @property string $spam
*/ */
class WP_User { class WP_User {
/** /**

4
src/wp-includes/class-wp-customize-manager.php
View File

@ -889,8 +889,8 @@ final class WP_Customize_Manager {
* *
* @since 3.4.0 * @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 $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 $b Object B.
* @return int * @return int
*/ */
protected function _cmp_priority( $a, $b ) { protected function _cmp_priority( $a, $b ) {

3
src/wp-includes/class-wp.php
View File

@ -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 * 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 * 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 string $subject subject if regex
* @param array $matches data to use in map * @param array $matches data to use in map
* @return self
*/ */
public function __construct($subject, $matches) { public function __construct($subject, $matches) {
$this->_subject = $subject; $this->_subject = $subject;

7
src/wp-includes/ms-deprecated.php
View File

@ -194,15 +194,18 @@ function get_most_active_blogs( $num = 10, $display = true ) {
$blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details $blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
if ( is_array( $blogs ) ) { if ( is_array( $blogs ) ) {
reset( $blogs ); reset( $blogs );
$most_active = array();
$blog_list = array();
foreach ( (array) $blogs as $key => $details ) { foreach ( (array) $blogs as $key => $details ) {
$most_active[ $details['blog_id'] ] = $details['postcount']; $most_active[ $details['blog_id'] ] = $details['postcount'];
$blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!! $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
} }
arsort( $most_active ); arsort( $most_active );
reset( $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 ]; $t[ $key ] = $blog_list[ $key ];
}
unset( $most_active ); unset( $most_active );
$most_active = $t; $most_active = $t;
} }