Changeset 5827 for trunk/src/includes/core/theme-compat.php

Timestamp:

07/14/2015 12:31:42 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Abstraction: Use bbp_db(), bbp_rewrite() & friends, introduced in r5823 & r5826.

This commit improves the stability of bbPress in the WordPress environment by reducing global variable exposure. It also comes with minimal opcode improvements in some circumstances where $GLOBALS is preferred over defining via global statements.

Some additional surrounding cleanup directly related to functions & methods being altered is also being performed here.

Fixes #2786.

File:

• trunk/src/includes/core/theme-compat.php (modified) (1 diff)

trunk/src/includes/core/theme-compat.php

@@ -804 +804 @@
  *
  * @since bbPress (r2628)
+ *
  * @param string $redirect_url Redirect url
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_use_pretty_urls() To check if the blog is using permalinks
  * @uses bbp_get_paged() To get the current page number
  * @uses bbp_is_single_topic() To check if it's a topic page
  * @uses bbp_is_single_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;
 
     // Canonical is for the beautiful
-    if ( $wp_rewrite->using_permalinks() ) {
+    if ( bbp_use_pretty_urls() ) {
 
         // If viewing beyond page 1 of several