Changeset 291 for branches

Timestamp:

Jun 18, 2009, 10:41:06 AM (16 years ago)

Author:

toemon

Message:

チケット #158 のpatch158.zip適応

Location:

branches/Ver2.0/xpressme_integration_kit

Files:

• wp-config.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/pluggable-override.php (modified) (2 diffs)

branches/Ver2.0/xpressme_integration_kit/wp-config.php

@@ -97 +97 @@
         require_once $xoops_config->xoops_mainfile_path; //It is necessary to execute it for the user attestation before wp-settings.php. 
         require_once(ABSPATH.'wp-settings.php');
+        if (!is_object($xoopsUser)){    // before login auth cookie clear
+                wp_logout();
+        }
         wp();
         

branches/Ver2.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -23 +23 @@
         if ($xoopsModule){
                 if (!is_object($xoopsUser)){
-                                wp_set_current_user(0);
-                                wp_clearcookie();
-
-//                              wp_logout();             // When IE is used, it becomes page error by the guest if the wp_logout() is executed here. 
-                                return false;
+                        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. 
+                        }                                       
+                        return false;
                 }
                 if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
@@ -95 +96 @@
         }
         wp_set_current_user(0);
-        wp_clearcookie();
         return 0;       
 }