Changeset 3572

Timestamp:

11/02/2011 06:23:57 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Introduce functions for topic/reply per-page settings, to prevent divide by zero errors if setting is saved as '0' string. See r3540. (2.1)

Location:

branches/plugin/bbp-includes

Files:

• bbp-common-functions.php (modified) (5 diffs)
• bbp-core-compatibility.php (modified) (1 diff)
• bbp-reply-functions.php (modified) (1 diff)
• bbp-reply-template.php (modified) (2 diffs)
• bbp-topic-functions.php (modified) (1 diff)
• bbp-topic-template.php (modified) (2 diffs)

branches/plugin/bbp-includes/bbp-common-functions.php

@@ -1371 +1371 @@
                             'post_parent'    => 'any',
                             'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
-                            'posts_per_page' => get_option( '_bbp_replies_per_rss_page', 25 ),
+                            'posts_per_page' => bbp_get_replies_per_rss_page(),
                             'order'          => 'DESC',
                             'meta_query'     => $meta_query
@@ -1388 +1388 @@
                             'post_parent'    => 'any',
                             'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
-                            'posts_per_page' => get_option( '_bbp_topics_per_rss_page', 25 ),
+                            'posts_per_page' => bbp_get_topics_per_rss_page(),
                             'order'          => 'DESC',
                             'meta_query'     => $meta_query
@@ -1405 +1405 @@
                             'post_parent'    => 'any',
                             'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
-                            'posts_per_page' => get_option( '_bbp_replies_per_rss_page', 25 ),
+                            'posts_per_page' => bbp_get_replies_per_rss_page(),
                             'order'          => 'DESC',
                             'meta_query'     => $meta_query
@@ -1438 +1438 @@
                             'author'         => 0,
                             'post_parent'    => 'any',
-                            'posts_per_page' => get_option( '_bbp_topics_per_rss_page', 25 ),
+                            'posts_per_page' => bbp_get_topics_per_rss_page(),
                             'show_stickies'  => false,
                         );
@@ -1453 +1453 @@
                     // The query
                     $the_query = array(
-                        'posts_per_page' => get_option( '_bbp_replies_per_rss_page', 25 ),
+                        'posts_per_page' => bbp_get_replies_per_rss_page(),
                         'meta_query'     => array( array( ) )
                     );

branches/plugin/bbp-includes/bbp-core-compatibility.php

@@ -1764 +1764 @@
     // Topic tag page
     } elseif ( bbp_is_topic_tag() ) {
-        $posts_query->set( 'bbp_topic_tag',  get_query_var( 'term' )                  );
-        $posts_query->set( 'post_type',      bbp_get_topic_post_type()                );
-        $posts_query->set( 'posts_per_page', get_option( '_bbp_topics_per_page', 15 ) );
+        $posts_query->set( 'bbp_topic_tag',  get_query_var( 'term' )   );
+        $posts_query->set( 'post_type',      bbp_get_topic_post_type() );
+        $posts_query->set( 'posts_per_page', bbp_get_topics_per_page() );
     }
 }

branches/plugin/bbp-includes/bbp-reply-functions.php

@@ -1253 +1253 @@
 }
 
+/** Settings ******************************************************************/
+
+/**
+ * Return the replies per page setting
+ *
+ * @since bbPress (r3540)
+ *
+ * @uses get_option() To get the setting
+ * @uses apply_filters() To allow the return value to be manipulated
+ * @return int
+ */
+function bbp_get_replies_per_page() {
+
+    // The default per setting
+    $default = 15;
+
+    // Get database option and cast as integer
+    $per = $retval = (int) get_option( '_bbp_replies_per_page', $default );
+
+    // If return val is empty, set it to default
+    if ( empty( $retval ) )
+        $retval = $default;
+
+    // Filter and return
+    return (int) apply_filters( 'bbp_get_replies_per_page', $retval, $per );
+}
+
+/**
+ * Return the replies per RSS page setting
+ *
+ * @since bbPress (r3540)
+ *
+ * @uses get_option() To get the setting
+ * @uses apply_filters() To allow the return value to be manipulated
+ * @return int
+ */
+function bbp_get_replies_per_rss_page() {
+
+    // The default per setting
+    $default = 25;
+
+    // Get database option and cast as integer
+    $per = $retval = (int) get_option( '_bbp_replies_per_rss_page', $default );
+
+    // If return val is empty, set it to default
+    if ( empty( $retval ) )
+        $retval = $default;
+
+    // Filter and return
+    return (int) apply_filters( 'bbp_get_replies_per_rss_page', $retval, $per );
+}
+
 /** Feeds *********************************************************************/
 

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -101 +101 @@
 
         // Max number
-        'posts_per_page' => get_option( '_bbp_replies_per_page', 15 ),
+        'posts_per_page' => bbp_get_replies_per_page(),
 
         // Page Number
@@ -378 +378 @@
 
         // Check if in query with pagination
-        $reply_page     = ceil( $reply_position / get_option( '_bbp_replies_per_page', 15 ) );
+        $reply_page     = ceil( (int) $reply_position / (int) bbp_get_replies_per_page() );
 
         // Hash to add to end of URL

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -2878 +2878 @@
 }
 
+/** Settings ******************************************************************/
+
+/**
+ * Return the topics per page setting
+ *
+ * @since bbPress (r3540)
+ *
+ * @uses get_option() To get the setting
+ * @uses apply_filters() To allow the return value to be manipulated
+ * @return int
+ */
+function bbp_get_topics_per_page() {
+
+    // The default per setting
+    $default = 15;
+
+    // Get database option and cast as integer
+    $per = $retval = (int) get_option( '_bbp_topics_per_page', $default );
+
+    // If return val is empty, set it to default
+    if ( empty( $retval ) )
+        $retval = $default;
+
+    // Filter and return
+    return (int) apply_filters( 'bbp_get_topics_per_page', $retval, $per );
+}
+
+/**
+ * Return the topics per RSS page setting
+ *
+ * @since bbPress (r3540)
+ *
+ * @uses get_option() To get the setting
+ * @uses apply_filters() To allow the return value to be manipulated
+ * @return int
+ */
+function bbp_get_topics_per_rss_page() {
+
+    // The default per setting
+    $default = 25;
+
+    // Get database option and cast as integer
+    $per = $retval = (int) get_option( '_bbp_topics_per_rss_page', $default );
+
+    // If return val is empty, set it to default
+    if ( empty( $retval ) )
+        $retval = $default;
+
+    // Filter and return
+    return (int) apply_filters( 'bbp_get_topics_per_rss_page', $retval, $per );
+}
+
 /** Feeds *********************************************************************/
 

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -94 +94 @@
 
         // Topics per page
-        'posts_per_page' => get_option( '_bbp_topics_per_page', 15 ),
+        'posts_per_page' => bbp_get_topics_per_page(),
 
         // Page Number
@@ -681 +681 @@
             'base'      => $base,
             'format'    => '',
-            'total'     => ceil( (int) $total / (int) get_option( '_bbp_replies_per_page', 15 ) ),
+            'total'     => ceil( (int) $total / (int) bbp_get_replies_per_page() ),
             'current'   => 0,
             'prev_next' => false,