Changeset 1254 for trunk/bp-core/bp-core-templatetags.php

Timestamp:

03/25/2009 07:01:30 PM (16 years ago)

Author:

apeatling

Message:

Fixes #606

File:

• trunk/bp-core/bp-core-templatetags.php (modified) (4 diffs)

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

@@ -535 +535 @@
 
 function bp_activation_page( $echo = true ) {
+    global $bp;
+    
     if ( bp_has_custom_activation_page() ) {
         if ( $echo )
-            echo site_url(ACTIVATION_SLUG);
+            echo $bp->root_domain . '/' . ACTIVATION_SLUG;
         else
-            return site_url(ACTIVATION_SLUG);
+            return $bp->root_domain . '/' . ACTIVATION_SLUG;
     } else {
         if ( $echo )
-            echo site_url('wp-activate.php');
+            echo $bp->root_domain . '/wp-activate.php';
         else
-            return site_url('wp-activate.php');
+            return $bp->root_domain . '/wp-activate.php';
     }
 }
@@ -551 +553 @@
     global $bp;
     
-    return apply_filters( 'bp_search_form_action', site_url('search') );
+    return apply_filters( 'bp_search_form_action', $bp->root_domain . '/search' );
 }
 
@@ -590 +592 @@
 
 function bp_login_bar() {
+    global $bp;
+    
     if ( !is_user_logged_in() ) : ?>
         
-        <form name="login-form" id="login-form" action="<?php echo site_url( '/wp-login.php' ) ?>" method="post">
+        <form name="login-form" id="login-form" action="<?php echo $bp->root_domain . '/wp-login.php' ?>" method="post">
             <input type="text" name="log" id="user_login" value="<?php _e( 'Username', 'buddypress' ) ?>" onfocus="if (this.value == '<?php _e( 'Username', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Username', 'buddypress' ) ?>';}" />
             <input type="password" name="pwd" id="user_pass" class="input" value="" />
@@ -614 +618 @@
             <?php 
                 if ( function_exists('wp_logout_url') ) {
-                    $logout_link = '/ <a href="' . wp_logout_url( site_url() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
+                    $logout_link = '/ <a href="' . wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
                 } else {
-                    $logout_link = '/ <a href="' . site_url( '/wp-login.php?action=logout&amp;redirect_to=' . site_url() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';                 
+                    $logout_link = '/ <a href="' . $bp->root_domain . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a>';                    
                 }