Changeset 4258 for trunk/bbp-includes/replies/functions.php

Timestamp:

10/19/2012 07:42:49 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Number Formatting:

• Introduce $integer parameter to template-tags to switch filter for integer usage.
• Use absint() where appropriate when getting counts.
• Smarter int type casting.
• Fixes bug where calculations were being done against formatted strings.
• Fixes #1974.

File:

• trunk/bbp-includes/replies/functions.php (modified) (6 diffs)

trunk/bbp-includes/replies/functions.php

@@ -262 +262 @@
         'post_type'      => bbp_get_reply_post_type(),
         'comment_status' => 'closed',
-        'menu_order'     => (int) ( bbp_get_topic_reply_count( $topic_id ) + 1 )
+        'menu_order'     => bbp_get_topic_reply_count( $topic_id, false ) + 1
     ) );
 
@@ -1342 +1342 @@
  * @since bbPress (r3540)
  *
+ * @param int $default Default replies per page (15)
  * @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;
+function bbp_get_replies_per_page( $default = 15 ) {
 
     // Get database option and cast as integer
-    $per = $retval = (int) get_option( '_bbp_replies_per_page', $default );
+    $retval = get_option( '_bbp_replies_per_page', $default );
 
     // If return val is empty, set it to default
@@ -1359 +1357 @@
 
     // Filter and return
-    return (int) apply_filters( 'bbp_get_replies_per_page', $retval, $per );
+    return absint( apply_filters( 'bbp_get_replies_per_page', $retval, $default ) );
 }
 
@@ -1367 +1365 @@
  * @since bbPress (r3540)
  *
+ * @param int $default Default replies per page (25)
  * @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;
+function bbp_get_replies_per_rss_page( $default = 25 ) {
 
     // Get database option and cast as integer
-    $per = $retval = (int) get_option( '_bbp_replies_per_rss_page', $default );
+    $retval = get_option( '_bbp_replies_per_rss_page', $default );
 
     // If return val is empty, set it to default
@@ -1384 +1380 @@
 
     // Filter and return
-    return (int) apply_filters( 'bbp_get_replies_per_rss_page', $retval, $per );
+    return absint( apply_filters( 'bbp_get_replies_per_rss_page', $retval, $default ) );
 }
 
@@ -1670 +1666 @@
 
         // Make sure the topic has replies before running another query
-        $reply_count = bbp_get_topic_reply_count( $topic_id );
+        $reply_count = bbp_get_topic_reply_count( $topic_id, false );
         if ( !empty( $reply_count ) ) {