Index: branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php =================================================================== diff -u -r7368 -r7492 --- branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 7368) +++ branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 7492) @@ -465,6 +465,7 @@ function OnListBuild(&$event) { $object =& $event->getObject(); + /* @var $object kDBList */ $this->dbBuild($object,$event); Index: branches/unlabeled/unlabeled-1.3.2/core/install/install_data.sql =================================================================== diff -u -r7456 -r7492 --- branches/unlabeled/unlabeled-1.3.2/core/install/install_data.sql (.../install_data.sql) (revision 7456) +++ branches/unlabeled/unlabeled-1.3.2/core/install/install_data.sql (.../install_data.sql) (revision 7492) @@ -575,4 +575,4 @@ INSERT INTO Permissions VALUES (0, 'in-portal:service.view', 11, 1, 1, 0); -INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('Core', 'core/', 'adm', '4.0.0', 1, 1, '', 0, '0'); +INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('Core', 'core/', 'adm', '4.0.1', 1, 1, '', 0, '0'); Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php =================================================================== diff -u -r7474 -r7492 --- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php (.../application.php) (revision 7474) +++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php (.../application.php) (revision 7492) @@ -649,6 +649,7 @@ function ProcessRequest() { $event_manager =& $this->recallObject('EventManager'); + /* @var $event_manager kEventManager */ if($this->isDebugMode() && constOn('DBG_SHOW_HTTPQUERY')) { $this->Debugger->appendHTML('HTTPQuery:'); Index: branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php =================================================================== diff -u -r7474 -r7492 --- branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php (.../event_manager.php) (revision 7474) +++ branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php (.../event_manager.php) (revision 7492) @@ -196,20 +196,20 @@ { $unit_config_reader =& $this->Application->recallObject('kUnitConfigReader'); $unit_config_reader->loadConfig($event->Prefix); + if( !$this->Application->prefixRegistred($event->Prefix) ) + { + trigger_error('Prefix '.$event->Prefix.' not registred (requested event '.$event->Name.')', E_USER_NOTICE); + return false; + } } - if( !$this->Application->prefixRegistred($event->Prefix) ) - { - trigger_error('Prefix '.$event->Prefix.' not registred (requested event '.$event->Name.')', E_USER_NOTICE); - return false; - } - if (!$event->SkipBeforeHooks) { $this->processHooks($event, hBEFORE); if ($event->status == erFATAL) return true; } $event_handler =& $this->Application->recallObject($event->Prefix.'_EventHandler'); + /* @var $event_handler kEventHandler */ $event_handler->processEvent($event); if ($event->status == erFATAL) return true; @@ -277,6 +277,7 @@ $event->redirect = true; $event_handler =& $this->Application->recallObject($event->Prefix.'_EventHandler'); + /* @var $event_handler kEventHandler */ $event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true)); if (($this->Application->RecallVar('user_id') == -1) || $event_handler->CheckPermission($event)) { $this->HandleEvent($event); Index: branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php =================================================================== diff -u -r7472 -r7492 --- branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7472) +++ branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7492) @@ -294,12 +294,14 @@ { $object =& $event->getObject( Array('skip_autoload' => true) ); - $object->addCalculatedField('IsNew', ' IF(%1$s.NewItem = 2, - IF(%1$s.CreatedOn >= (UNIX_TIMESTAMP() - '. - $this->Application->ConfigValue('Category_DaysNew'). - '*3600*24), 1, 0), - %1$s.NewItem - )'); + $object->addCalculatedField( + 'IsNew', + ' IF(%1$s.NewItem = 2, + IF(%1$s.CreatedOn >= (UNIX_TIMESTAMP() - '. + $this->Application->ConfigValue('Category_DaysNew'). + '*3600*24), 1, 0), + %1$s.NewItem + )'); } /**