Changeset 343 for trunk

Timestamp:

Jul 23, 2009, 12:55:34 PM (15 years ago)

Author:

toemon

Message:

Impress CMSでインラインに表示されるイベント選択が表示されない バグ修正 fixes #186

Location:

trunk/xpressme_integration_kit

Files:

• include/xpress_render.php (modified) (2 diffs)
• wp-content/plugins/xpressme/include/notify_functions.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/xpress_render.php

@@ -148 +148 @@
 function xpress_render($contents){
         global $xoops_config , $xoopsTpl,$xpress_config;
+        global $xoopsUser;
+
         xpress_remake_global_for_permlink();
         $mydirname = basename(dirname(dirname(__FILE__)));
@@ -218 +220 @@
         $xpress_data['now_user_level'] = xpress_now_user_level('echo=0');
 
+        //If notification_select.php is not executed in CMS other than XCL, the selector of in-line is not displayed. 
+        if (is_object($xoopsModule) && $xoopsModule->getVar('hasnotification') == 1 && is_object($xoopsUser)) {
+                require_once $xoops_config->xoops_root_path . '/include/notification_select.php';
+        }
+        
         $xoopsTpl->assign('xpress', $xpress_data);
         $templates_file = 'db:'.$mydirname. '_index.html';

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

@@ -49 +49 @@
         }
 //      set_error_handler("xpress_error_handler");
-        require_once $xoops_config->xoops_mainfile_path;        // load XOOPS System
-        $module_id = get_xpress_modid() ;
-        $notification_handler =& xoops_gethandler( 'notification' ) ;
-        $notification_handler->triggerEvent($category, $item_id, $event, $extra_tags, $user_list, $module_id, $omit_user_id);
+        if ($xoops_config->is_impress != true){  // impress cms is error
+                if ( !defined("XOOPS_MAINFILE_INCLUDED")) {
+                        require_once $xoops_config->xoops_mainfile_path;        // load XOOPS System
+                }
+        }
+        if ( defined("XOOPS_MAINFILE_INCLUDED")) {
+                $module_id = get_xpress_modid() ;
+                $notification_handler =& xoops_gethandler( 'notification' ) ;
+                $notification_handler->triggerEvent($category, $item_id, $event, $extra_tags, $user_list, $module_id, $omit_user_id);
+        }
 }