Changeset 5827 for trunk/src/includes/users/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/users/template.php (modified) (15 diffs)

trunk/src/includes/users/template.php

@@ -336 +336 @@
      * @param string $user_nicename Optional. User nicename
      * @uses bbp_get_user_id() To get user id
-     * @uses WP_Rewrite::using_permalinks() To check if the blog is using
-     *                                       permalinks
+     * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
      * @uses add_query_arg() To add custom args to the url
      * @uses home_url() To get blog home url
@@ -345 +344 @@
      */
     function bbp_get_user_profile_url( $user_id = 0, $user_nicename = '' ) {
-        global $wp_rewrite;
 
         // Use displayed user ID if there is one, and one isn't requested
@@ -360 +358 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
 
             // Get username if not passed
@@ -367 +365 @@
             }
 
-            $url = trailingslashit( $wp_rewrite->root . bbp_get_user_slug() ) . $user_nicename;
+            $url = trailingslashit( bbp_get_root_url() . bbp_get_user_slug() ) . $user_nicename;
             $url = user_trailingslashit( $url );
             $url = home_url( $url );
@@ -439 +437 @@
      * @uses bbp_get_user_id() To get user id
      * @uses bbp_get_user_profile_url() To get the user profile url
-     * @uses WP_Rewrite::using_permalinks() To check if the blog is using
-     *                                       permalinks
+     * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
      * @uses add_query_arg() To add custom args to the url
      * @uses home_url() To get blog home url
@@ -448 +445 @@
      */
     function bbp_get_user_profile_edit_url( $user_id = 0, $user_nicename = '' ) {
-        global $wp_rewrite;
 
         $user_id = bbp_get_user_id( $user_id );
@@ -465 +461 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $profile_url ) . 'edit';
             $url = user_trailingslashit( $url );
@@ -820 +816 @@
      */
     function bbp_get_favorites_permalink( $user_id = 0 ) {
-        global $wp_rewrite;
 
         // Use displayed user ID if there is one, and one isn't requested
@@ -838 +833 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $profile_url ) . bbp_get_user_favorites_rewrite_id();
             $url = user_trailingslashit( $url );
@@ -980 +975 @@
      */
     function bbp_get_subscriptions_permalink( $user_id = 0 ) {
-        global $wp_rewrite;
 
         // Use displayed user ID if there is one, and one isn't requested
@@ -998 +992 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $profile_url ) . bbp_get_user_subscriptions_slug();
             $url = user_trailingslashit( $url );
@@ -1421 +1415 @@
      */
     function bbp_get_user_topics_created_url( $user_id = 0 ) {
-        global $wp_rewrite;
 
         // Use displayed user ID if there is one, and one isn't requested
@@ -1439 +1432 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $profile_url ) . bbp_get_topic_archive_slug();
             $url = user_trailingslashit( $url );
@@ -1479 +1472 @@
      */
     function bbp_get_user_replies_created_url( $user_id = 0 ) {
-        global $wp_rewrite;
 
         // Use displayed user ID if there is one, and one isn't requested
@@ -1497 +1489 @@
 
         // Pretty permalinks
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
             $url = trailingslashit( $profile_url ) . bbp_get_reply_archive_slug();
             $url = user_trailingslashit( $url );