Index: trunk/core/kernel/startup.php =================================================================== diff -u -r2566 -r2581 --- trunk/core/kernel/startup.php (.../startup.php) (revision 2566) +++ trunk/core/kernel/startup.php (.../startup.php) (revision 2581) @@ -26,12 +26,6 @@ include_once(KERNEL_PATH.'/globals.php'); // non OOP functions used through kernel, e.g. print_pre -if( file_exists(FULL_PATH.'/debug.php') ) -{ - k4_include_once(FULL_PATH.'/debug.php'); - if( defined('DEBUG_MODE') && DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php'); -} - safeDefine('INPORTAL_TAGS', true); $reg = '/'.preg_quote (DOC_ROOT, '/').'/i'; @@ -68,9 +62,17 @@ define('EXPORT_PATH', DOC_ROOT.BASE_PATH.'/admin/export'); define('GW_CLASS_PATH', MODULES_PATH.'/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path - safeDefine('ENV_VAR_NAME','env'); +k4_include_once(KERNEL_PATH.'/application.php'); +k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php'); + +if( file_exists(FULL_PATH.'/debug.php') ) +{ + k4_include_once(FULL_PATH.'/debug.php'); + if( defined('DEBUG_MODE') && DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php'); +} + k4_include_once(KERNEL_PATH.'/db/db_connection.php'); safeDefine('IMAGES_PATH', '/kernel/images/'); @@ -95,15 +97,12 @@ k4_include_once(KERNEL_PATH."/db/db_tag_processor.php"); k4_include_once(KERNEL_PATH."/event_handler.php"); - k4_include_once(KERNEL_PATH.'/db/db_event_handler.php'); +k4_include_once(MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php'); k4_include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase // up to here -k4_include_once(KERNEL_PATH.'/application.php'); -k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php'); - //safeDefine('LOGIN_CONTROLLER', 'LoginController'); //safeDefine('USER_MODEL', 'User');