Changeset 3245 for branches/1.2/bp-core/bp-core-templatetags.php

Timestamp:

09/10/2010 08:12:08 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Clean-up pagination in all components. Fixes #2625. Props BenFremer on your first trac ticket!

File:

• branches/1.2/bp-core/bp-core-templatetags.php (modified) (2 diffs)

branches/1.2/bp-core/bp-core-templatetags.php

@@ -22 +22 @@
 
         $this->pag_page = isset( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : $page_number;
-        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-        $this->type = $type;
-
-        if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+        $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        $this->type     = $type;
+
+        if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] )
             $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras );
-        } else {
+        else
             $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
-        }
 
         if ( !$max || $max >= (int)$this->members['total'] )
@@ -39 +38 @@
 
         if ( $max ) {
-            if ( $max >= count($this->members) )
-                $this->member_count = count($this->members);
-            else
+            if ( $max >= count($this->members) ) {
+                $this->member_count = count( $this->members );
+            } else {
                 $this->member_count = (int)$max;
+            }
         } else {
-            $this->member_count = count($this->members);
+            $this->member_count = count( $this->members );
         }
 
-        if ( (int) $this->total_member_count && (int) $this->pag_num ) {
+        if ( (int)$this->total_member_count && (int)$this->pag_num ) {
             $this->pag_links = paginate_links( array(
-                'base' => add_query_arg( 'upage', '%#%' ),
-                'format' => '',
-                'total' => ceil( (int) $this->total_member_count / (int) $this->pag_num ),
-                'current' => (int) $this->pag_page,
+                'base'      => add_query_arg( 'upage', '%#%' ),
+                'format'    => '',
+                'total'     => ceil( (int)$this->total_member_count / (int)$this->pag_num ),
+                'current'   => (int)$this->pag_page,
                 'prev_text' => '←',
                 'next_text' => '→',
-                'mid_size' => 1
-            ));
+                'mid_size'  => 1
+            ) );
         }
     }