Wordpress 3.7

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-plugins-list-table.php

diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index ae1d1b8d8dedbe0b203632af2ea8c9e064a53b77..9e648498fe8653e2e29d79e33d2546cec86bd95a 100644 (file)
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -99,7 +99,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
                if ( $s ) {
                        $status = 'search';
 
                if ( $s ) {
                        $status = 'search';

-                       $plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
+                       $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );

                }
 
                $totals = array();
                }
 
                $totals = array();


@@ -121,7 +121,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
                        $orderby = ucfirst( $orderby );
                        $order = strtoupper( $order );
 
                        $orderby = ucfirst( $orderby );
                        $order = strtoupper( $order );
 

-                       uasort( $this->items, array( &$this, '_order_callback' ) );
+                       uasort( $this->items, array( $this, '_order_callback' ) );

                }
 
                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
                }
 
                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );


@@ -321,7 +321,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
                        if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
                                $is_active = true;
                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
                        if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
                                $is_active = true;
                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';

-                       } elseif ( constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+                       } elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true

                                $is_active = true;
                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
                        } else {
                                $is_active = true;
                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
                        } else {