Changeset 6609 for trunk/bp-activity/bp-activity-admin.php
- Timestamp:
- 12/10/2012 02:43:06 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-admin.php
r6479 r6609 168 168 // Decide whether to load the dev version of the CSS and JavaScript 169 169 $min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : 'min.'; 170 171 // Bottom bulk action hack 172 if ( !empty( $_REQUEST['action2'] ) ) { 173 $_REQUEST['action'] = $_REQUEST['action2']; 174 unset( $_REQUEST['action2'] ); 175 } 170 176 171 177 // Decide whether to load the index or edit screen … … 533 539 */ 534 540 function bp_activity_admin_edit() { 535 global $screen_layout_columns;536 541 537 542 // @todo: Check if user is allowed to edit activity items … … 564 569 565 570 // Call an action for plugins to modify the activity before we display the edit form 566 do_action_ref_array( 'bp_activity_admin_edit', array( &$activity ) ); 567 ?> 571 do_action_ref_array( 'bp_activity_admin_edit', array( &$activity ) ); ?> 568 572 569 573 <div class="wrap"> … … 731 735 732 736 // Sort array by the human-readable value 733 natsort( $actions ); 734 ?> 737 natsort( $actions ); ?> 735 738 736 739 <select name="bp-activities-type"> … … 788 791 // Make sure we don't get any empty values in $errors 789 792 for ( $i = 0, $errors_count = count( $errors ); $i < $errors_count; $i++ ) { 790 if ( 0 === $errors[$i] ) 793 if ( 0 === $errors[$i] ) { 791 794 unset( $errors[$i] ); 795 } 792 796 } 793 797 … … 831 835 832 836 // Call an action for plugins to modify the activity before we display the edit form 833 do_action( 'bp_activity_admin_index', $messages ); 834 ?> 837 do_action( 'bp_activity_admin_index', $messages ); ?> 835 838 836 839 <div class="wrap"> … … 897 900 */ 898 901 class BP_Activity_List_Table extends WP_List_Table { 902 899 903 /** 900 904 * What type of view is being displayed? e.g. "All", "Pending", "Approved", "Spam"... … … 1067 1071 extract( $this->_args ); 1068 1072 1069 $this->display_tablenav( 'top' ); 1070 ?> 1073 $this->display_tablenav( 'top' ); ?> 1071 1074 1072 1075 <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0"> … … 1100 1103 function single_row( $item ) { 1101 1104 static $row_class = ''; 1102 $row_class = ( $row_class == '' ? ' class="alternate"' : '' ); 1105 1106 if ( empty( $row_class ) ) { 1107 $row_class = ' class="alternate"'; 1108 } else { 1109 $row_class = ''; 1110 } 1103 1111 1104 1112 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 1290 1298 // Get activity content - if not set, use the action 1291 if ( ! empty( $item['content'] ) ) 1299 if ( ! empty( $item['content'] ) ) { 1292 1300 $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $item['content'] ) ); 1293 else1301 } else { 1294 1302 $content = apply_filters_ref_array( 'bp_get_activity_action', array( $item['action'] ) ); 1303 } 1295 1304 1296 1305 echo $content . ' ' . $this->row_actions( $actions );
Note: See TracChangeset
for help on using the changeset viewer.