Changeset 3192

Timestamp:

05/21/2011 09:50:56 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Move a few theme compatibility helper functions out of bbp-general-functions.php and into bbp-core-compatibility.php

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-compatibility.php (modified) (1 diff)
• bbp-general-functions.php (modified) (3 diffs)

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

@@ -800 +800 @@
 }
 
+/** Helpers *******************************************************************/
+
+/**
+ * Remove the canonical redirect to allow pretty pagination
+ *
+ * @since bbPress (r2628)
+ *
+ * @param string $redirect_url Redirect url
+ * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_is_topic() To check if it's a topic page
+ * @uses bbp_get_paged() To get the current page number
+ * @uses bbp_is_forum() To check if it's a forum page
+ * @return bool|string False if it's a topic/forum and their first page,
+ *                      otherwise the redirect url
+ */
+function bbp_redirect_canonical( $redirect_url ) {
+    global $wp_rewrite;
+
+    if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_is_topic() && 1 < bbp_get_paged() )
+            $redirect_url = false;
+        elseif ( bbp_is_forum() && 1 < bbp_get_paged() )
+            $redirect_url = false;
+    }
+
+    return $redirect_url;
+}
+
+/**
+ * Sets the 404 status.
+ *
+ * Used primarily with topics/replies inside hidden forums.
+ *
+ * @since bbPress (r3051)
+ *
+ * @global WP_Query $wp_query
+ * @uses WP_Query::set_404()
+ */
+function bbp_set_404() {
+    global $wp_query;
+
+    if ( ! isset( $wp_query ) ) {
+        _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+        return false;
+    }
+
+    $wp_query->set_404();
+}
+
+
 ?>

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

@@ -78 +78 @@
  */
 function bbp_number_format( $number, $decimals = false ) {
+
     // If empty, set $number to '0'
     if ( empty( $number ) || !is_numeric( $number ) )
@@ -158 +159 @@
 
     // We add our own full stop.
-    while ( substr( $reason, -1 ) == '.' ) {
+    while ( substr( $reason, -1 ) == '.' )
         $reason = substr( $reason, 0, -1 );
-    }
 
     // Trim again
@@ -182 +182 @@
 function bbp_show_lead_topic( $show_lead = false ) {
     return apply_filters( 'bbp_show_lead_topic', (bool) $show_lead );
-}
-
-/**
- * Remove the canonical redirect to allow pretty pagination
- *
- * @since bbPress (r2628)
- *
- * @param string $redirect_url Redirect url
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
- * @uses bbp_is_topic() To check if it's a topic page
- * @uses bbp_get_paged() To get the current page number
- * @uses bbp_is_forum() To check if it's a forum page
- * @return bool|string False if it's a topic/forum and their first page,
- *                      otherwise the redirect url
- */
-function bbp_redirect_canonical( $redirect_url ) {
-    global $wp_rewrite;
-
-    if ( $wp_rewrite->using_permalinks() ) {
-        if ( bbp_is_topic() && 1 < bbp_get_paged() )
-            $redirect_url = false;
-        elseif ( bbp_is_forum() && 1 < bbp_get_paged() )
-            $redirect_url = false;
-    }
-
-    return $redirect_url;
-}
-
-/**
- * Sets the 404 status.
- *
- * Used primarily with topics/replies inside hidden forums.
- *
- * @since bbPress (r3051)
- *
- * @global WP_Query $wp_query
- * @uses WP_Query::set_404()
- */
-function bbp_set_404() {
-    global $wp_query;
-
-    if ( ! isset( $wp_query ) ) {
-        _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
-        return false;
-    }
-
-    $wp_query->set_404();
 }