Changeset 6334 for trunk/src/includes/users/template.php

Timestamp:

03/01/2017 02:17:21 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Engagements: Integrate the user_query into favorites, subscriptions, and engagements.

• Add to admin metabox avatar loops
• Fix a few bugs in BBP_User_Query, and include a custom constructor to set the loop counter

See #3068.

File:

• trunk/src/includes/users/template.php (modified) (7 diffs)

trunk/src/includes/users/template.php

@@ -57 +57 @@
 
     /**
-     * Set up the next user and iterate current user index.
+     * PHP5 constructor.
      *
      * @since 2.6.0 bbPress (r6330)
      * @access public
      *
+     * @param null|string|array $query Optional. The query variables.
+     */
+    public function __construct( $query = null ) {
+        if ( ! empty( $query ) ) {
+            parent::__construct( $query );
+            $this->user_count = count( $this->results );
+        }
+    }
+
+    /**
+     * Set up the next user and iterate current user index.
+     *
+     * @since 2.6.0 bbPress (r6330)
+     * @access public
+     *
      * @return WP_User Next user.
      */
     public function next_user() {
-
         $this->current_user++;
-
-        $this->user = $this->users[ $this->current_user ];
+        $this->user = $this->results[ $this->current_user ];
 
         return $this->user;
@@ -89 +102 @@
         // loop has just started
         if ( $this->current_user === -1 ) {
+
             /**
              * Fires once the loop is started.
              *
-             * @since 2.6.0 bbPress
+             * @since 2.6.0 bbPress (r6330)
              *
              * @param WP_Query &$this The WP_Query instance (passed by reference).
@@ -99 +113 @@
         }
 
-        $this->user = $this->next_user();
+        $this->next_user();
     }
 
@@ -120 +134 @@
              * Fires once the loop has ended.
              *
-             * @since 2.0.0
+             * @since 2.6.0 bbPress (r6330)
              *
              * @param WP_Query &$this The WP_Query instance (passed by reference).
@@ -145 +159 @@
 
         if ( $this->user_count > 0 ) {
-            $this->user = $this->users[ 0 ];
+            $this->user = $this->results[ 0 ];
         }
     }
@@ -190 +204 @@
  */
 function bbp_users() {
-    return bbpress()->user_query->have_users();;
+    return bbpress()->user_query->have_users();
 }
 
@@ -238 +252 @@
         if ( ! empty( $user_id ) && is_numeric( $user_id ) ) {
             $bbp_user_id = $user_id;
+
+        // Currently inside a user loop
+        } elseif ( ! empty( $bbp->user_query->in_the_loop ) && isset( $bbp->user_query->user->ID ) ) {
+            $bbp_user_id = $bbp->user_query->user->ID;
 
         // Currently viewing or editing a user