Changeset 3982 for trunk/bp-core/bp-core-template.php

Timestamp:

02/01/2011 07:46:50 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Use bp_get_root_domain() in place of $bp->root_domain global

File:

• trunk/bp-core/bp-core-template.php (modified) (3 diffs)

trunk/bp-core/bp-core-template.php

@@ -296 +296 @@
     global $bp;
 
-    return apply_filters( 'bp_search_form_action', $bp->root_domain . '/' . BP_SEARCH_SLUG );
+    return apply_filters( 'bp_search_form_action', bp_get_root_domain() . '/' . BP_SEARCH_SLUG );
 }
 
@@ -386 +386 @@
     global $bp;
     if ( function_exists('wp_logout_url') )
-        $logout_link = '<a href="' . wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
+        $logout_link = '<a href="' . wp_logout_url( bp_get_root_domain() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
     else
-        $logout_link = '<a href="' . $bp->root_domain . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
+        $logout_link = '<a href="' . bp_get_root_domain() . '/wp-login.php?action=logout&amp;redirect_to=' . bp_get_root_domain() . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
 
     echo apply_filters( 'bp_logout_link', $logout_link );
@@ -562 +562 @@
         global $bp;
 
-        return apply_filters( 'bp_get_root_domain', $bp->root_domain );
+        if ( isset( $bp->root_domain ) && !empty( $bp->root_domain ) ) {
+            $domain = $bp->root_domain;
+        } else {
+            $domain          = bp_core_get_root_domain();
+            $bp->root_domain = $domain;
+        }
+
+        return apply_filters( 'bp_get_root_domain', $domain );
     }