Changeset 25392

Timestamp:

09/12/2013 06:24:09 AM (11 years ago)

Author:

wonderboymusic

Message:

• Add isset() checks all over WP_User_Query::prepare_query() and WP_User_Query::query(). When a WP_User_Query instance is constructed without passing args, no query vars are filled in, thus $qv doesn't contain most of the expected indices.
• Suppress an undefined index notice in tests/user/query.php

Fixes #25292.
See #25282.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (8 diffs)
• tests/phpunit/tests/user/query.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -410 +410 @@
         }
 
-        if ( $qv['count_total'] )
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] )
             $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 
@@ -417 +417 @@
 
         // sorting
-        if ( in_array( $qv['orderby'], array('nicename', 'email', 'url', 'registered') ) ) {
-            $orderby = 'user_' . $qv['orderby'];
-        } elseif ( in_array( $qv['orderby'], array('user_nicename', 'user_email', 'user_url', 'user_registered') ) ) {
-            $orderby = $qv['orderby'];
-        } elseif ( 'name' == $qv['orderby'] || 'display_name' == $qv['orderby'] ) {
-            $orderby = 'display_name';
-        } elseif ( 'post_count' == $qv['orderby'] ) {
-            // todo: avoid the JOIN
-            $where = get_posts_by_author_sql('post');
-            $this->query_from .= " LEFT OUTER JOIN (
-                SELECT post_author, COUNT(*) as post_count
-                FROM $wpdb->posts
-                $where
-                GROUP BY post_author
-            ) p ON ({$wpdb->users}.ID = p.post_author)
-            ";
-            $orderby = 'post_count';
-        } elseif ( 'ID' == $qv['orderby'] || 'id' == $qv['orderby'] ) {
-            $orderby = 'ID';
-        } elseif ( 'meta_value' == $qv['orderby'] ) {
-            $orderby = "$wpdb->usermeta.meta_value";
-        } else {
+        if ( isset( $qv['orderby'] ) ) {
+            if ( in_array( $qv['orderby'], array('nicename', 'email', 'url', 'registered') ) ) {
+                $orderby = 'user_' . $qv['orderby'];
+            } elseif ( in_array( $qv['orderby'], array('user_nicename', 'user_email', 'user_url', 'user_registered') ) ) {
+                $orderby = $qv['orderby'];
+            } elseif ( 'name' == $qv['orderby'] || 'display_name' == $qv['orderby'] ) {
+                $orderby = 'display_name';
+            } elseif ( 'post_count' == $qv['orderby'] ) {
+                // todo: avoid the JOIN
+                $where = get_posts_by_author_sql('post');
+                $this->query_from .= " LEFT OUTER JOIN (
+                    SELECT post_author, COUNT(*) as post_count
+                    FROM $wpdb->posts
+                    $where
+                    GROUP BY post_author
+                ) p ON ({$wpdb->users}.ID = p.post_author)
+                ";
+                $orderby = 'post_count';
+            } elseif ( 'ID' == $qv['orderby'] || 'id' == $qv['orderby'] ) {
+                $orderby = 'ID';
+            } elseif ( 'meta_value' == $qv['orderby'] ) {
+                $orderby = "$wpdb->usermeta.meta_value";
+            } else {
+                $orderby = 'user_login';
+            }
+        }
+
+        if ( empty( $orderby ) )
             $orderby = 'user_login';
-        }
-
-        $qv['order'] = strtoupper( $qv['order'] );
+
+        $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
         if ( 'ASC' == $qv['order'] )
             $order = 'ASC';
@@ -450 +455 @@
 
         // limit
-        if ( $qv['number'] ) {
+        if ( isset( $qv['number'] ) && $qv['number'] ) {
             if ( $qv['offset'] )
                 $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
@@ -457 +462 @@
         }
 
-        $search = trim( $qv['search'] );
+        $search = '';
+        if ( isset( $qv['search'] ) )
+            $search = trim( $qv['search'] );
+
         if ( $search ) {
             $leading_wild = ( ltrim($search, '*') != $search );
@@ -491 +499 @@
         }
 
-        $blog_id = absint( $qv['blog_id'] );
-
-        if ( 'authors' == $qv['who'] && $blog_id ) {
+        $blog_id = 0;
+        if ( isset( $qv['blog_id'] ) )
+            $blog_id = absint( $qv['blog_id'] );
+
+        if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
             $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
             $qv['meta_value'] = 0;
@@ -500 +510 @@
         }
 
-        $role = trim( $qv['role'] );
+        $role = '';
+        if ( isset( $qv['role'] ) )
+            $role = trim( $qv['role'] );
 
         if ( $blog_id && ( $role || is_multisite() ) ) {
@@ -526 +538 @@
         }
 
-        if ( !empty( $qv['include'] ) ) {
+        if ( ! empty( $qv['include'] ) ) {
             $ids = implode( ',', wp_parse_id_list( $qv['include'] ) );
             $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
-        } elseif ( !empty($qv['exclude']) ) {
+        } elseif ( ! empty( $qv['exclude'] ) ) {
             $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
             $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
@@ -554 +566 @@
         }
 
-        if ( $qv['count_total'] )
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] )
             $this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
 

trunk/tests/phpunit/tests/user/query.php

@@ -21 +21 @@
 
         $this->assertEquals( '', $users->get( 'fields' ) );
-        $this->assertEquals( '', $users->query_vars['fields'] );
+        $this->assertEquals( '', @$users->query_vars['fields'] );
 
         $users->set( 'fields', 'all' );