WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 22:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix strict warnings for WP_Plugins_List_Table::bulk_actions() and WP_Plugins_List_Table::single_row(). Props kurtpayne. fixes #22224

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@22376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-11-05 18:29:20 +00:00
parent b10f343480
commit 44774b52ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-list-table.php
View File

@ -765,7 +765,7 @@ class WP_List_Table {
<div class="tablenav <?php echo esc_attr( $which ); ?>"> <div class="tablenav <?php echo esc_attr( $which ); ?>">
<div class="alignleft actions"> <div class="alignleft actions">
<?php $this->bulk_actions( $which ); ?> <?php $this->bulk_actions(); ?>
</div> </div>
<?php <?php
$this->extra_tablenav( $which ); $this->extra_tablenav( $which );

9
wp-admin/includes/class-wp-plugins-list-table.php
View File

@ -252,13 +252,13 @@ class WP_Plugins_List_Table extends WP_List_Table {
return $actions; return $actions;
} }
function bulk_actions( $which ) { function bulk_actions() {
global $status; global $status;
if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
return; return;
parent::bulk_actions( $which ); parent::bulk_actions();
} }
function extra_tablenav( $which ) { function extra_tablenav( $which ) {
@ -293,12 +293,13 @@ class WP_Plugins_List_Table extends WP_List_Table {
return; return;
foreach ( $this->items as $plugin_file => $plugin_data ) foreach ( $this->items as $plugin_file => $plugin_data )
$this->single_row( $plugin_file, $plugin_data ); $this->single_row( array( $plugin_file, $plugin_data ) );
} }
function single_row( $plugin_file, $plugin_data ) { function single_row( $item ) {
global $status, $page, $s, $totals; global $status, $page, $s, $totals;
list( $plugin_file, $plugin_data ) = $item;
$context = $status; $context = $status;
$screen = $this->screen; $screen = $this->screen;