Ticket #6606: 6606.02.patch

src/bp-activity/bp-activity-admin.php

@@ -1186 +1186 @@
         }
 
         /**
+         * Get name of default primary column name and make sure nothing is broken in
+         * configurations < WP 4.0
+         *
+         * @since 2.3.4
+         * @access protected
+         *
+         * @return string
+         */
+        protected function get_primary_column_name() {
+                if ( ! method_exists( 'WP_List_Table', 'get_primary_column_name' ) ) {
+                        return $this->get_default_primary_column_name();
+                }
+
+                parent::get_primary_column_name();
+        }
+
+        /**
          * Get an array of all the columns on the page.
          *
          * @since 1.6.0
@@ -1393 +1410 @@
 
                 <div class="alignleft actions">
                         <label for="activity-type" class="screen-reader-text"><?php _e( 'Filter by activity type', 'buddypress' ); ?></label>
-                        <select name="activity_type" id="activity-type"> 
+                        <select name="activity_type" id="activity-type">
                                 <option value="" <?php selected( ! $selected ); ?>><?php _e( 'View all actions', 'buddypress' ); ?></option>
 
                                 <?php foreach ( $activity_actions as $component => $actions ) : ?>
@@ -1432 +1449 @@
          * unnecessary <button> addition.
          *
          * @since 2.3.3
-         * @access protected
+         * @access public
          *
          * @param array $actions The list of actions
          * @param bool $always_visible Whether the actions should be always visible
          * @return string
          */
-        protected function row_actions( $actions, $always_visible = false ) {
+        public function row_actions( $actions, $always_visible = false ) {
                 $action_count = count( $actions );
                 $i = 0;
 

src/bp-groups/bp-groups-admin.php

@@ -1500 +1500 @@
          * unnecessary <button> addition.
          *
          * @since 2.3.3
-         * @access protected
+         * @access public
          *
          * @param array $actions The list of actions
          * @param bool $always_visible Whether the actions should be always visible
          * @return string
          */
-        protected function row_actions( $actions, $always_visible = false ) {
+        public function row_actions( $actions, $always_visible = false ) {
                 $action_count = count( $actions );
                 $i = 0;