Changeset 6402

Timestamp:

10/13/2012 07:29:33 AM (13 years ago)

Author:

r-a-y

Message:

Theme Compat:

• In bp_core_no_access(), change the 'mode' argument to 2 so it uses wp-login.php if bp_enable_theme_compat() is true.

• This was done because accessing a restricted item like /members/USERNAME/settings/ did not show the login form.

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -459 +459 @@
 
     $defaults = array(
-        'mode'     => '1',                  // 1 = $root, 2 = wp-login.php
-        'redirect' => $redirect_url,        // the URL you get redirected to when a user successfully logs in
-        'root'     => bp_get_root_domain(), // the landing page you get redirected to when a user doesn't have access
+        'mode'     => bp_enable_theme_compat() ? 2 : 1, // 1 = $root, 2 = wp-login.php
+        'redirect' => $redirect_url,                    // the URL you get redirected to when a user successfully logs in
+        'root'     => bp_get_root_domain(),         // the landing page you get redirected to when a user doesn't have access
         'message'  => __( 'You must log in to access the page you requested.', 'buddypress' )
     );
@@ -472 +472 @@
      * @ignore Ignore these filters and use 'bp_core_no_access' above
      */
-    $mode       = apply_filters( 'bp_no_access_mode',     $mode,     $root,     $redirect, $message );
-    $redirect   = apply_filters( 'bp_no_access_redirect', $redirect, $root,     $message,  $mode    );
-    $root       = apply_filters( 'bp_no_access_root',     $root,     $redirect, $message,  $mode    );
-    $message    = apply_filters( 'bp_no_access_message',  $message,  $root,     $redirect, $mode    );
-    $root       = trailingslashit( $root );
+    $mode     = apply_filters( 'bp_no_access_mode',     $mode,     $root,     $redirect, $message );
+    $redirect = apply_filters( 'bp_no_access_redirect', $redirect, $root,     $message,  $mode    );
+    $root     = apply_filters( 'bp_no_access_root',     $root,     $redirect, $message,  $mode    );
+    $message  = apply_filters( 'bp_no_access_message',  $message,  $root,     $redirect, $mode    );
+    $root     = trailingslashit( $root );
 
     switch ( $mode ) {