Changeset 15746 for trunk/wp-includes/pluggable.php

Timestamp:

10/07/2010 07:34:18 PM (15 years ago)

Author:

ryan

Message:

First pass of user admin. Network admin and screen cleanups. see #14696

File:

• trunk/wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-includes/pluggable.php

@@ -82 +82 @@
 
     if ( ! $user = wp_validate_auth_cookie() ) {
-         if ( is_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+         if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
             wp_set_current_user(0);
             return false;
@@ -776 +776 @@
     }
 
-    if ( $user_id = wp_validate_auth_cookie( '', apply_filters( 'auth_redirect_scheme', '' ) ) ) {
+    if ( is_user_admin() )
+        $scheme = 'logged_in';
+    else
+        $scheme = apply_filters( 'auth_redirect_scheme', '' );
+
+    if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
         do_action('auth_redirect', $user_id);