Changeset 3245 for branches/1.2/bp-messages/bp-messages-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-messages/bp-messages-templatetags.php (modified) (4 diffs)

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

@@ -22 +22 @@
     function bp_messages_box_template( $user_id, $box, $per_page, $max, $type ) {
         $this->pag_page = isset( $_GET['mpage'] ) ? intval( $_GET['mpage'] ) : 1;
-        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
-
-        $this->user_id = $user_id;
-        $this->box = $box;
-        $this->type = $type;
-
-        if ( 'notices' == $this->box )
+        $this->pag_num  = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
+
+        $this->user_id  = $user_id;
+        $this->box      = $box;
+        $this->type     = $type;
+
+        if ( 'notices' == $this->box ) {
             $this->threads = BP_Messages_Notice::get_notices();
-        else {
+        } else {
             $threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->type, $this->pag_num, $this->pag_page );
 
-            $this->threads = $threads['threads'];
+            $this->threads            = $threads['threads'];
             $this->total_thread_count = $threads['total'];
         }
 
         if ( !$this->threads ) {
-            $this->thread_count = 0;
+            $this->thread_count       = 0;
             $this->total_thread_count = 0;
         } else {
@@ -44 +44 @@
 
             if ( !$max || $max >= (int)$total_notice_count ) {
-                if ( 'notices' == $this->box )
+                if ( 'notices' == $this->box ) {
                     $this->total_thread_count = (int)$total_notice_count;
+                }
             } else {
                 $this->total_thread_count = (int)$max;
@@ -51 +52 @@
 
             if ( $max ) {
-                if ( $max >= count($this->threads) )
+                if ( $max >= count($this->threads) ) {
                     $this->thread_count = count($this->threads);
-                else
+                } else {
                     $this->thread_count = (int)$max;
+                }
             } else {
                 $this->thread_count = count($this->threads);
@@ -60 +62 @@
         }
 
-        $this->pag_links = paginate_links( array(
-            'base' => add_query_arg( 'mpage', '%#%' ),
-            'format' => '',
-            'total' => ceil($this->total_thread_count / $this->pag_num),
-            'current' => $this->pag_page,
-            'prev_text' => '←',
-            'next_text' => '→',
-            'mid_size' => 1
-        ));
+        if ( (int)$this->total_topic_count && (int)$this->pag_num ) {
+            $this->pag_links = paginate_links( array(
+                'base'      => add_query_arg( 'mpage', '%#%' ),
+                'format'    => '',
+                'total'     => ceil( (int)$this->total_thread_count / (int)$this->pag_num ),
+                'current'   => $this->pag_page,
+                'prev_text' => '←',
+                'next_text' => '→',
+                'mid_size'  => 1
+            ) );
+        }
     }