Changeset 2815

Timestamp:

03/08/2010 02:02:37 PM (16 years ago)

Author:

apeatling

Message:

Further fix for #2104

Location:

branches/1.2

Files:

• bp-activity.php (modified) (1 diff)
• bp-core.php (modified) (1 diff)

branches/1.2/bp-activity.php

@@ -252 +252 @@
             bp_core_redirect( $bp->loggedin_user->domain );
         else
-            bp_core_redirect( $bp->root_domain );
+            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . clean_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) );
     }
 

branches/1.2/bp-core.php

@@ -2104 +2104 @@
         return $redirect_to;
 
-    if ( !empty( $_REQUEST['redirect_to'] ) && strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
+    if ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
         return $redirect_to;