Changeset 769 for branches/Ver2.4/xpressme_integration_kit/include

Timestamp:

May 24, 2011, 9:03:23 AM (14 years ago)

Author:

toemon

Message:

ブランチ構成ミス、changeset 758に戻す

Location:

branches/Ver2.4/xpressme_integration_kit/include

Files:

• add_xpress_config.php (modified) (1 diff)
• add_xpress_process.php (modified) (1 diff)

branches/Ver2.4/xpressme_integration_kit/include/add_xpress_config.php

@@ -1 +1 @@
 <?php
-$request_method =  (isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] : '';
-//$_SERVER['REQUEST_METHOD'] = 'POST' is
-//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. 
-$_SERVER['REQUEST_METHOD'] = 'POST';
-
-if ( defined('WP_ADMIN') )      {
-        $nocommon_scripts = array(
-                'wp-admin/async-upload.php',
-        );
-        foreach($nocommon_scripts as $nocommon_script){
-                if (strstr($_SERVER['SCRIPT_NAME'],$nocommon_script) !== false) {
-                        $xoopsOption['nocommon'] = 1;
-                        break;
-                }
-        }
-}
-
-require_once dirname(dirname(dirname(dirname( __FILE__ )))).'/mainfile.php' ;
-
-$_SERVER['REQUEST_METHOD'] = $request_method; //It returns it to former data. 
-
 require_once dirname( __FILE__ ).'/xpress_debug_log.php' ;
 require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;

branches/Ver2.4/xpressme_integration_kit/include/add_xpress_process.php

@@ -118 +118 @@
 
 if (is_xpress_index_page_call()){
+        //$_SERVER['REQUEST_METHOD'] = 'POST' is
+        //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;
         xpress_set_memory_limmit(); // Set memory limmit.(Limmit Value from XPressMe modele config.)
         unset($offset);         //This Trap is provides the case where $offset is defined on the XOOPS side.