Changeset 5827 for trunk/src/includes/common/template.php

Timestamp:

07/14/2015 12:31:42 AM (11 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/common/template.php (modified) (2 diffs)

trunk/src/includes/common/template.php

@@ -2058 +2058 @@
      */
     function bbp_get_view_url( $view = false ) {
-        global $wp_rewrite;
 
         $view = bbp_get_view_id( $view );
@@ -2066 +2065 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
-            $url = $wp_rewrite->root . bbp_get_view_slug() . '/' . $view;
-            $url = home_url( user_trailingslashit( $url ) );
+        if ( bbp_use_pretty_urls() ) {
+            $url = trailingslashit( bbp_get_root_url() . bbp_get_view_slug() ) . $view;
+            $url = user_trailingslashit( $url );
+            $url = home_url( $url );
 
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( bbp_get_view_rewrite_id() => $view ), home_url( '/' ) );
+            $url = add_query_arg( array(
+                bbp_get_view_rewrite_id() => $view
+            ), home_url( '/' ) );
         }