Changeset 843 for trunk/xpressme_integration_kit

Timestamp:

Oct 26, 2013, 7:49:46 PM (11 years ago)

Author:

toemon

Message:

get_currentuserinfo()の修正 fixed #427
thx miho

File:

• trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php (modified) (1 diff)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -54 +54 @@
                         return xpress_login();  
                 } else {                                                        // For the xoops guest
-                        wp_set_current_user(0);
-                        if ( !preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']) && 
-                                !preg_match("/msie/", $_SERVER['HTTP_USER_AGENT'])) 
-                        {
-                                wp_logout();    // When IE is used, it becomes page error by the guest if the wp_logout() is executed here. 
+                
+                        if (function_exists('wp_validate_auth_cookie')){
+                                if ( ! $user = wp_validate_auth_cookie() ) {
+                                         if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+                                                wp_set_current_user(0);
+                                                return false;
+                                         }
+                                }
+                                wp_set_current_user($user);
+                        } else { // for WP2.0
+                                if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) || 
+                                        !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
+                                        wp_set_current_user(0);
+                                        return false;
+                                }
+                                $user_login = $_COOKIE[USER_COOKIE];
+                                wp_set_current_user(0, $user_login);
                         }
                         return false;