Changeset 783 for trunk

Timestamp:

May 30, 2011, 11:02:13 AM (14 years ago)

Author:

toemon

Message:

XOOPS 3 (XOOPS Engine)でXOOPS_MAINFILE_INCLUDEDが定義されていない部分に対応

Location:

trunk/xpressme_integration_kit

Files:

• class/langInfo_class.php (modified) (1 diff)
• class/modInfo_class.php (modified) (1 diff)
• class/userInfo_class.php (modified) (1 diff)
• class/wpConfigInfo_class.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/notify_functions.php (modified) (2 diffs)

trunk/xpressme_integration_kit/class/langInfo_class.php

@@ -9 +9 @@
  */
 
-if (defined( 'XOOPS_MAINFILE_INCLUDED')) :
+if (defined( 'XOOPS_MAINFILE_INCLUDED')|| defined( 'XOOPS_BOOTSTRAP')) :
 class langInfoClass {
         var $xoops_Lang;

trunk/xpressme_integration_kit/class/modInfo_class.php

@@ -9 +9 @@
  */
 
-if (defined( 'XOOPS_MAINFILE_INCLUDED')) :
+if (defined( 'XOOPS_MAINFILE_INCLUDED')|| defined( 'XOOPS_BOOTSTRAP')) :
 
 class modInfoClass {

trunk/xpressme_integration_kit/class/userInfo_class.php

@@ -9 +9 @@
  */
 
-if (defined( 'XOOPS_MAINFILE_INCLUDED')) :
+if (defined( 'XOOPS_MAINFILE_INCLUDED')|| defined( 'XOOPS_BOOTSTRAP')) :
 class userInfoClass {
         var $is_logon;

trunk/xpressme_integration_kit/class/wpConfigInfo_class.php

@@ -9 +9 @@
  */
 
-if (defined( 'XOOPS_MAINFILE_INCLUDED')) :
+if (defined( 'XOOPS_MAINFILE_INCLUDED')|| defined( 'XOOPS_BOOTSTRAP')) :
 require_once dirname( __FILE__ ).'/langInfo_class.php' ;
 

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

@@ -52 +52 @@
                 $_SERVER['REQUEST_METHOD'] = 'POST';
         }
-        if (!$force_reserve && defined("XOOPS_MAINFILE_INCLUDED") ) {
+        if (!$force_reserve && (defined("XOOPS_MAINFILE_INCLUDED")|| defined( 'XOOPS_BOOTSTRAP')) ) {
                 if ( defined("XPRESS_EVENT_DEBUG")) xpress_debug_message($message = 'call $notification_handler->triggerEvent');
                 $module_id = get_xpress_modid() ;
@@ -215 +215 @@
 {
         global $xpress_config,$xoops_db;
-        if ( ! defined("XOOPS_MAINFILE_INCLUDED")) return;
+        if ( ! (defined("XOOPS_MAINFILE_INCLUDED"))|| defined( 'XOOPS_BOOTSTRAP')) return;
         
         $notification_handler =& xoops_gethandler( 'notification' ) ;