Index: trunk/core/kernel/event_handler.php =================================================================== diff -u -r932 -r958 --- trunk/core/kernel/event_handler.php (.../event_handler.php) (revision 932) +++ trunk/core/kernel/event_handler.php (.../event_handler.php) (revision 958) @@ -62,17 +62,6 @@ } /** - * Retunrs object used in event - * - * @param kEvent $event - * @access protected - */ - function &createObject(&$event) - { - return $this->Application->recallObject($event->Prefix_Special,$event->pseudoClass); - } - - /** * Apply some special processing to * object beeing recalled before using * it in other events that call prepareObject Index: trunk/core/kernel/db/db_event_handler.php =================================================================== diff -u -r949 -r958 --- trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 949) +++ trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 958) @@ -55,7 +55,7 @@ */ function OnItemBuild(&$event) { - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $this->dbBuild(&$object,&$event); $sql=$this->getSelectSQL($event,'OnItemPrepareQuery'); @@ -84,7 +84,7 @@ function OnListBuild(&$event) { $event->setPseudoClass('_List'); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $this->dbBuild(&$object,&$event); @@ -119,7 +119,7 @@ } $event->setPseudoClass('_List'); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $object->SetPerPage($per_page); $object->CountRecs(); @@ -137,7 +137,7 @@ function SetSorting(&$event) { $event->setPseudoClass('_List'); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $cur_sort1 = $this->Application->RecallVar($event->Prefix_Special.'_Sort1'); $cur_sort1_dir = $this->Application->RecallVar($event->Prefix_Special.'_Sort1_Dir'); @@ -184,7 +184,7 @@ $this->Application->LinkVar($event->getPrefixSpecial(true).'_Sort1_Dir',$event->Prefix_Special.'_Sort1_Dir'); //$event->setPseudoClass('_List'); - //$object =& $this->createObject(&$event); + //$object =& $event->createObject(); } /** @@ -273,7 +273,7 @@ function OnCreate(&$event) { $this->Application->setUnitOption($this->getPrefixSpecial(),'AutoLoad',false); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $this->prepareObject(&$object,&$event); $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -300,7 +300,7 @@ function OnUpdate(&$event) { $this->Application->setUnitOption($this->getPrefixSpecial(),'AutoLoad',false); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $this->prepareObject(&$object,&$event); $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -334,7 +334,7 @@ function OnDelete(&$event) { $this->Application->setUnitOption($this->getPrefixSpecial(),'AutoLoad',false); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $object->ID=$this->Application->GetVar($event->Prefix_Special.'_id'); if( $object->Delete() ) { @@ -357,7 +357,7 @@ function OnNew(&$event) { $this->Application->setUnitOption($this->getPrefixSpecial(),'AutoLoad',false); - $object =& $this->createObject(&$event); + $object =& $event->createObject(); $this->prepareObject(&$object,&$event); $object->setID(0); $this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate'); Index: trunk/core/kernel/utility/event.php =================================================================== diff -u -r932 -r958 --- trunk/core/kernel/utility/event.php (.../event.php) (revision 932) +++ trunk/core/kernel/utility/event.php (.../event.php) (revision 958) @@ -3,7 +3,7 @@ define('erFAIL',-2); define('erSUCCESS',0); - class kEvent { + class kEvent extends kBase { /** * Event reference, that @@ -28,7 +28,7 @@ * @var string * @access public */ - var $Prefix; + //var $Prefix; /** * Special, that is recognized @@ -38,7 +38,7 @@ * @var string * @access public */ - var $Special; + //var $Special; /** * Joined prefix and special, @@ -131,6 +131,16 @@ $this->Prefix_Special = rtrim($this->Prefix.'.'.$this->Special,'.'); } + /** + * Returns object used in event + * + * @access public + */ + function &createObject() + { + return $this->Application->recallObject($this->Prefix_Special,$this->pseudoClass); + } + } ?> \ No newline at end of file