Changeset 4898 for trunk/bp-core/bp-core-filters.php

Timestamp:

07/29/2011 09:39:28 PM (15 years ago)

Author:

boonebgorges

Message:

Ensures that bp_core_login_redirect() successfully directs users away from wp-admin. Fixes #2073. Props francescolaffi

File:

• trunk/bp-core/bp-core-filters.php (modified) (1 diff)

trunk/bp-core/bp-core-filters.php

@@ -129 +129 @@
         global $bp, $wpdb;
 
+        // Don't mess with the redirect if this is not the root blog
         if ( is_multisite() && $wpdb->blogid != bp_get_root_blog_id() )
                 return $redirect_to;
 
-        if ( isset( $_REQUEST['redirect_to'] ) && ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) ) )
+        // If the redirect doesn't contain 'wp-admin', it's OK
+        if ( isset( $_REQUEST['redirect_to'] ) && false === strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
                 return $redirect_to;