Changeset 6609 for trunk/bp-activity/bp-activity-admin.php

Timestamp:

12/10/2012 02:43:06 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Fix issue with activity and group admin bottom bulk actions not working. Fixes #4547.

File:

• trunk/bp-activity/bp-activity-admin.php (modified) (10 diffs)

trunk/bp-activity/bp-activity-admin.php

@@ -168 +168 @@
     // Decide whether to load the dev version of the CSS and JavaScript
     $min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : 'min.';
+
+    // Bottom bulk action hack
+    if ( !empty( $_REQUEST['action2'] ) ) {
+        $_REQUEST['action'] = $_REQUEST['action2'];
+        unset( $_REQUEST['action2'] );
+    }
 
     // Decide whether to load the index or edit screen
@@ -533 +539 @@
  */
 function bp_activity_admin_edit() {
-    global $screen_layout_columns;
 
     // @todo: Check if user is allowed to edit activity items
@@ -564 +569 @@
 
     // Call an action for plugins to modify the activity before we display the edit form
-    do_action_ref_array( 'bp_activity_admin_edit', array( &$activity ) );
-?>
+    do_action_ref_array( 'bp_activity_admin_edit', array( &$activity ) ); ?>
 
     <div class="wrap">
@@ -731 +735 @@
 
     // Sort array by the human-readable value
-    natsort( $actions );
-?>
+    natsort( $actions ); ?>
 
     <select name="bp-activities-type">
@@ -788 +791 @@
         // Make sure we don't get any empty values in $errors
         for ( $i = 0, $errors_count = count( $errors ); $i < $errors_count; $i++ ) {
-            if ( 0 === $errors[$i] )
+            if ( 0 === $errors[$i] ) {
                 unset( $errors[$i] );
+            }
         }
 
@@ -831 +835 @@
 
     // Call an action for plugins to modify the activity before we display the edit form
-    do_action( 'bp_activity_admin_index', $messages );
-?>
+    do_action( 'bp_activity_admin_index', $messages ); ?>
 
     <div class="wrap">
@@ -897 +900 @@
  */
 class BP_Activity_List_Table extends WP_List_Table {
+
     /**
      * What type of view is being displayed? e.g. "All", "Pending", "Approved", "Spam"...
@@ -1067 +1071 @@
         extract( $this->_args );
 
-        $this->display_tablenav( 'top' );
-    ?>
+        $this->display_tablenav( 'top' ); ?>
 
         <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0">
@@ -1100 +1103 @@
     function single_row( $item ) {
         static $row_class = '';
-        $row_class = ( $row_class == '' ? ' class="alternate"' : '' );
+
+        if ( empty( $row_class ) ) {
+            $row_class = ' class="alternate"';
+        } else {
+            $row_class = '';
+        }
 
         echo '<tr' . $row_class . ' id="activity-' . esc_attr( $item['id'] ) . '" data-parent_id="' . esc_attr( $item['id'] ) . '" data-root_id="' . esc_attr( $item['item_id'] ) . '">';
@@ -1289 +1297 @@
 
         // Get activity content - if not set, use the action
-        if ( ! empty( $item['content'] ) )
+        if ( ! empty( $item['content'] ) ) {
             $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $item['content'] ) );
-        else
+        } else {
             $content = apply_filters_ref_array( 'bp_get_activity_action', array( $item['action'] ) );
+        }
 
         echo $content . ' ' . $this->row_actions( $actions );