Ticket #2647: 2647.002.patch

bp-core-catchuri.php

@@ -269 +269 @@
         // Add .php to all options in $bp_path
         foreach( (array) $bp_path as $template )
                 $filtered_templates[] = "$template.php";
 
-        // If the template file doesn't exist, redirect to the root domain.
-        if ( !bp_is_blog_page() && !file_exists( apply_filters( 'bp_located_template', locate_template( $filtered_templates, false ), $filtered_templates ) ) ) 
-                bp_core_redirect( $bp->root_domain );
-
         if ( !$bp_path && !bp_is_blog_page() ) {
                 if ( is_user_logged_in() ) {
                         wp_redirect( $bp->root_domain );
                 } else {
-                        wp_redirect( site_url( 'wp-login.php?redirect_to=' . site_url() . $_SERVER['REQUEST_URI'] ) );
+                        wp_redirect( wp_login_url( site_url() . $_SERVER['REQUEST_URI'] ) );
                 }
         }
+
+        // If the template file doesn't exist, redirect to the root domain.
+        if ( !bp_is_blog_page() && !file_exists( apply_filters( 'bp_located_template', locate_template( $filtered_templates, false ), $filtered_templates ) ) ) 
+                bp_core_redirect( $bp->root_domain );
 }
 add_action( 'wp', 'bp_core_catch_no_access' );
 
 /**