Changeset 477 for trunk

Timestamp:

Dec 3, 2009, 5:11:25 PM (15 years ago)

Author:

toemon

Message:

WP Super Cacheプラグインへの対応 #263

Location:

trunk/xpressme_integration_kit

Files:

• include/add_xpress_process.php (modified) (1 diff)
• include/set_cash_cookie_path.php (modified) (6 diffs)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (2 diffs)
• wp-content/plugins/xpressme/include/xpress_common_functions.php (modified) (2 diffs)

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -36 +36 @@
         //When notifying by a private message, Notification_reserve_send();
         //it is evaded that the data base becomes read-only as a result of the check on the referrer and the method. 
+        $request_method =  (isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] : '';
         $_SERVER['REQUEST_METHOD'] = 'POST';
-
         require_once $xoops_config->xoops_mainfile_path; //It is necessary to execute it for the user attestation before wp-settings.php. 
+        $_SERVER['REQUEST_METHOD'] = $request_method;
         unset($offset);
         require_once(ABSPATH.'wp-settings.php');

trunk/xpressme_integration_kit/include/set_cash_cookie_path.php

@@ -8 +8 @@
  */
 if ( !defined('USER_COOKIE') )
-        define('USER_COOKIE', $modname . 'user_' . $hash);
+        define('USER_COOKIE', 'wordpress_' . $modname . 'user_' . $hash);
 
 /**
@@ -15 +15 @@
  */
 if ( !defined('PASS_COOKIE') )
-        define('PASS_COOKIE', $modname . 'pass_' . $hash);
+        define('PASS_COOKIE', 'wordpress_' . $modname . 'pass_' . $hash);
 
 /**
@@ -22 +22 @@
  */
 if ( !defined('AUTH_COOKIE') )
-        define('AUTH_COOKIE', $modname . '_auth_' . $hash);
+        define('AUTH_COOKIE', 'wordpress_' . $modname . '_auth_' . $hash);
 
 /**
@@ -29 +29 @@
  */
 if ( !defined('SECURE_AUTH_COOKIE') )
-        define('SECURE_AUTH_COOKIE', $modname . '_sec_' . $hash);
+        define('SECURE_AUTH_COOKIE', 'wordpress_' . $modname . '_sec_' . $hash);
 
 /**
@@ -36 +36 @@
  */
 if ( !defined('LOGGED_IN_COOKIE') )
-        define('LOGGED_IN_COOKIE', $modname . '_logged_in_' . $hash);
+        define('LOGGED_IN_COOKIE', 'wordpress_' . $modname . '_logged_in_' . $hash);
 
 /**
@@ -43 +43 @@
  */
 if ( !defined('TEST_COOKIE') )
-        define('TEST_COOKIE', $modname . '_test_cookie');
+        define('TEST_COOKIE', 'wordpress_' . $modname . '_test_cookie');
 
 /**

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -95 +95 @@
 
         $output = '';
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if (!empty($_COOKIE[$author_cookie])){
                 $uid = intval($_COOKIE[$author_cookie]);
@@ -115 +115 @@
         extract( $r );
         $output = '';
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if (!empty($_COOKIE[$author_cookie])){
                 $output = intval($_COOKIE[$author_cookie]);

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -242 +242 @@
         if (is_admin()) return $query_vars;
         
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if(xpress_is_multi_user()){
                 if (!empty($_GET)){
@@ -294 +294 @@
         if (is_admin()) return $query;
 
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         
         if (strpos($query,'SELECT') === false)  return $query;