Index: trunk/core/kernel/globals.php =================================================================== diff -u -N -r2604 -r2853 --- trunk/core/kernel/globals.php (.../globals.php) (revision 2604) +++ trunk/core/kernel/globals.php (.../globals.php) (revision 2853) @@ -101,19 +101,21 @@ $array = $new_array; } - /** - * Define constant if it was not already defined before - * - * @param string $const_name - * @param string $const_value - * @access public - */ - function safeDefine($const_name, $const_value) + if( !function_exists('safeDefine') ) { - if(!defined($const_name)) define($const_name,$const_value); + /** + * Define constant if it was not already defined before + * + * @param string $const_name + * @param string $const_value + * @access public + */ + function safeDefine($const_name, $const_value) + { + if(!defined($const_name)) define($const_name,$const_value); + } } - if( !function_exists('parse_portal_ini') ) { function parse_portal_ini($file, $parse_section = false) @@ -184,7 +186,7 @@ { function k4_include_once($file) { - if ( defined('DEBUG_MODE') && DEBUG_MODE && dbg_ConstOn('DBG_PROFILE_INCLUDES') ) + if ( defined('DEBUG_MODE') && DEBUG_MODE && defined('DBG_PROFILE_INCLUDES') && DBG_PROFILE_INCLUDES ) { if ( in_array($file, get_required_files()) ) return;