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

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

@@ -24 +24 @@
         global $bp;
 
-        $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : $page;
-        $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
-        $this->type = $type;
+        $this->pag_page     = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : $page;
+        $this->pag_num      = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
+        $this->type         = $type;
         $this->search_terms = $search_terms;
-        $this->forum_id = $forum_id;
+        $this->forum_id     = $forum_id;
 
         switch ( $type ) {
@@ -51 +51 @@
 
         if ( !(int)$this->topics ) {
-            $this->topic_count = 0;
+            $this->topic_count       = 0;
             $this->total_topic_count = 0;
         } else {
@@ -63 +63 @@
             }
 
-            if ( !$max || $max >= $topic_count )
+            if ( !$max || $max >= $topic_count ) {
                 $this->total_topic_count = $topic_count;
-            else
+            } else {
                 $this->total_topic_count = (int)$max;
+            }
 
             if ( $max ) {
-                if ( $max >= count($this->topics) )
+                if ( $max >= count($this->topics) ) {
                     $this->topic_count = count( $this->topics );
-                else
+                } else {
                     $this->topic_count = (int)$max;
+                }
             } else {
                 $this->topic_count = count( $this->topics );
@@ -78 +80 @@
         }
 
-        $this->topic_count = apply_filters( 'bp_forums_template_topic_count', $this->topic_count, &$topics, $type, $forum_id, $per_page, $max, $no_stickies );
+        $this->topic_count       = apply_filters( 'bp_forums_template_topic_count', $this->topic_count, &$topics, $type, $forum_id, $per_page, $max, $no_stickies );
         $this->total_topic_count = apply_filters( 'bp_forums_template_total_topic_count', $this->total_topic_count, $this->topic_count, &$topics, $type, $forum_id, $per_page, $max, $no_stickies );
 
-        if ( !$no_stickies) {
-            /* Place stickies at the top - not sure why bbPress doesn't do this? */
+        if ( !$no_stickies ) {
+            // Place stickies at the top - not sure why bbPress doesn't do this?
             foreach( (array)$this->topics as $topic ) {
-                if ( 1 == (int)$topic->topic_sticky )
+                if ( 1 == (int)$topic->topic_sticky ) {
                     $stickies[] = $topic;
-                else
+                } else {
                     $standard[] = $topic;
+                }
             }
+
             $this->topics = array_merge( (array)$stickies, (array)$standard );
         }
 
-        /* Fetch extra information for topics, so we don't have to query inside the loop */
+        // Fetch extra information for topics, so we don't have to query inside the loop
         $this->topics = bp_forums_get_topic_extras( &$this->topics );
 
-        $this->pag_links = paginate_links( array(
-            'base' => add_query_arg( array( 'p' => '%#%', 'n' => $this->pag_num ) ),
-            'format' => '',
-            'total' => ceil($this->total_topic_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( array( 'p' => '%#%', 'n' => $this->pag_num ) ),
+                'format'    => '',
+                'total'     => ceil( (int)$this->total_topic_count / (int)$this->pag_num),
+                'current'   => $this->pag_page,
+                'prev_text' => '←',
+                'next_text' => '→',
+                'mid_size'  => 1
+            ) );
+        }
     }
 
@@ -725 +731 @@
         $this->forum_id        = $forum_template->topic->forum_id;
 
-        $this->posts = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'order' => $this->order ) );
+        $this->posts           = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'order' => $this->order ) );
 
         if ( !$this->posts ) {
-            $this->post_count = 0;
+            $this->post_count       = 0;
             $this->total_post_count = 0;
         } else {
-            if ( !$max || $max >= (int) $forum_template->topic->topic_posts )
-                $this->total_post_count = (int) $forum_template->topic->topic_posts;
-            else
+            if ( !$max || $max >= (int)$forum_template->topic->topic_posts ) {
+                $this->total_post_count = (int)$forum_template->topic->topic_posts;
+            } else {
                 $this->total_post_count = (int)$max;
+            }
 
             if ( $max ) {
-                if ( $max >= count($this->posts) )
+                if ( $max >= count( $this->posts ) ) {
                     $this->post_count = count( $this->posts );
-                else
+                } else {
                     $this->post_count = (int)$max;
+                }
             } else {
                 $this->post_count = count( $this->posts );
@@ -746 +754 @@
         }
 
-        $this->pag_links = paginate_links( array(
-            'base' => add_query_arg( array( 'topic_page' => '%#%', 'num' => $this->pag_num ) ),
-            'format' => '',
-            'total' => ceil($this->total_post_count / $this->pag_num),
-            'current' => $this->pag_page,
-            'prev_text' => '←',
-            'next_text' => '→',
-            'mid_size' => 1
-        ));
-        $this->pag->total_pages = ceil($this->total_post_count / $this->pag_num);
+        if ( (int)$this->total_post_count && (int)$this->pag_num ) {
+            $this->pag_links = paginate_links( array(
+                'base'      => add_query_arg( array( 'topic_page' => '%#%', 'num' => (int)$this->pag_num ) ),
+                'format'    => '',
+                'total'     => ceil( (int)$this->total_post_count / (int)$this->pag_num ),
+                'current'   => $this->pag_page,
+                'prev_text' => '←',
+                'next_text' => '→',
+                'mid_size'  => 1
+            ) );
+
+            $this->pag->total_pages = ceil( (int)$this->total_post_count / (int)$this->pag_num );
+        } else {
+            $this->pag->total_pages = 1;
+        }
     }