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'); Index: trunk/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r2505 -r2581 --- trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 2505) +++ trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 2581) @@ -71,6 +71,11 @@ $block_params['name'] = $params['spearator_block']; $separator = $this->Application->ParseBlock($block_params); $filter_menu = $this->Application->getUnitOption($this->Prefix,'FilterMenu'); + if(!$filter_menu) + { + trigger_error('no filters defined for prefix '.$this->Prefix.', but DrawFilterMenu tag used', E_USER_WARNING); + return ''; + } // Params: label, filter_action, filter_status $block_params['name'] = $params['item_block']; @@ -86,6 +91,7 @@ $filters = Array(); $prefix_special = $this->getPrefixSpecial(); + foreach($filter_menu['Filters'] as $filter_key => $filter_params) { if(!$filter_params) Index: trunk/core/kernel/db/dblist.php =================================================================== diff -u -r2428 -r2581 --- trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 2428) +++ trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 2581) @@ -517,10 +517,8 @@ function GetOrderDirection($pos=NULL) { - if(!$this->OrderFields[$pos]) - $pos = 0; - - return $this->OrderFields[$pos][1]; + if( !getArrayValue($this->OrderFields, $pos) ) $pos = 0; + return getArrayValue($this->OrderFields, $pos, 1); } /** Index: trunk/admin/config/edit_customfields.php =================================================================== diff -u -r2569 -r2581 --- trunk/admin/config/edit_customfields.php (.../edit_customfields.php) (revision 2569) +++ trunk/admin/config/edit_customfields.php (.../edit_customfields.php) (revision 2581) @@ -182,11 +182,12 @@ } -$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0); +//$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0); -$objListToolBar->AddToInitScript("fwLoadMenus();"); +//$objListToolBar->AddToInitScript("fwLoadMenus();"); $h = "\n\n\n"; +if( !isset($title) ) $title = ''; int_header($objListToolBar,NULL,$title, NULL, $h); ?>