Changeset 912

Timestamp:

01/23/2009 08:09:36 PM (18 years ago)

Author:

apeatling

Message:

Fixes #382. Thanks to chriscree.

Location:

trunk/bp-core

Files:

• bp-core-adminbar.php (modified) (1 diff)
• bp-core-templatetags.php (modified) (1 diff)

trunk/bp-core/bp-core-adminbar.php

@@ -25 +25 @@
 // **** Default BuddyPress admin bar logo ********
 function bp_adminbar_logo() {
-        echo '<a href="' . get_blog_option( 1, 'siteurl' ) . '"><img id="admin-bar-logo" src="' . apply_filters( 'bp_admin_bar_logo_src', site_url( MUPLUGINDIR . '/bp-core/images/admin_bar_logo.gif' ) ) . '" alt="' . apply_filters( 'bp_admin_bar_logo_alt_text', __( 'BuddyPress', 'buddypress' ) ) . '" /></a>';
+        global $bp;
+        
+        echo '<a href="' . $bp['root_domain'] . '"><img id="admin-bar-logo" src="' . apply_filters( 'bp_admin_bar_logo_src', site_url( MUPLUGINDIR . '/bp-core/images/admin_bar_logo.gif' ) ) . '" alt="' . apply_filters( 'bp_admin_bar_logo_alt_text', __( 'BuddyPress', 'buddypress' ) ) . '" /></a>';
 }
 
 // **** "Log In" and "Sign Up" links (Visible when not logged in) ********
 function bp_adminbar_login_menu() {
+        global $bp;
+
         if ( !is_user_logged_in() ) {   
-                echo '<li class="bp-login no-arrow"><a href="' . site_url() . '/wp-login.php?redirect_to=' . urlencode(get_bloginfo('siteurl') . $_SERVER['REQUEST_URI']) . '">' . __( 'Log In', 'buddypress' ) . '</a></li>';
+                echo '<li class="bp-login no-arrow"><a href="' . $bp['root_domain'] . '/wp-login.php?redirect_to=' . urlencode(get_bloginfo('siteurl') . $_SERVER['REQUEST_URI']) . '">' . __( 'Log In', 'buddypress' ) . '</a></li>';
                 
                 // Show "Sign Up" link if registrations are allowed

trunk/bp-core/bp-core-templatetags.php

@@ -420 +420 @@
 
 function bp_signup_page( $echo = true ) {
+        global $bp;
+        
         if ( bp_has_custom_signup_page() ) {
                 if ( $echo )
-                        echo site_url(REGISTER_SLUG);
-                else
-                        return site_url(REGISTER_SLUG);
-        } else {
-                if ( $echo )
-                        echo site_url('wp-signup.php');
-                else
-                        return site_url('wp-signup.php');
+                        echo $bp['root_domain'] . '/' . REGISTER_SLUG;
+                else
+                        return $bp['root_domain'] . '/' . REGISTER_SLUG;
+        } else {
+                if ( $echo )
+                        echo $bp['root_domain'] . '/wp-signup.php';
+                else
+                        return $bp['root_domain'] . '/wp-signup.php';
         }
 }