Changeset 31211

Timestamp:

01/16/2015 06:36:46 PM (10 years ago)

Author:

wonderboymusic

Message:

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

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-list-table.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• wp-includes/class-wp.php (modified) (2 diffs)
• wp-includes/ms-deprecated.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -1034 +1034 @@
     }
 
-    public function column_default( $item, $column_name ) {}
-
-    public function column_cb( $item ) {}
-    
+    protected function column_default( $item, $column_name ) {}
+
+    protected function column_cb( $item ) {}
+
     /**
      * Generates the columns for a single row of the table

trunk/src/wp-includes/capabilities.php

@@ -430 +430 @@
  * @property string $user_registered
  * @property string $user_url
+ * @property string $spam
  */
 class WP_User {

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -890 +890 @@
      * @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
      */

trunk/src/wp-includes/class-wp.php

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

trunk/src/wp-includes/ms-deprecated.php

@@ -195 +195 @@
     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'];
@@ -201 +203 @@
         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;