From 09e61f534bb046b6df4e965856de60b95703d92c Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Sat, 9 Aug 2014 14:46:17 +0000
Subject: [PATCH] WP_Plugins_List_Table::bulk_actions() method declaration
 should match WP_List_Table, see [29440].

props imath.
fixes #29148.
Built from https://develop.svn.wordpress.org/trunk@29453


git-svn-id: http://core.svn.wordpress.org/trunk@29231 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-plugins-list-table.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index b6a6718ab6..377db7391d 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -108,7 +108,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					unset( $recently_activated[$key] );
 			update_option( 'recently_activated', $recently_activated );
 		}
-		
+
 		$plugin_info = get_site_transient( 'update_plugins' );
 
 		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
@@ -298,7 +298,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		return $actions;
 	}
 
-	public function bulk_actions( $which ) {
+	public function bulk_actions( $which = '' ) {
 		global $status;
 
 		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
@@ -402,7 +402,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					if ( ! is_multisite() && current_user_can('delete_plugins') )
 						$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
 				} // end if $is_active
-				
+
 			 } // end if $screen->in_admin( 'network' )
 
 			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )