Index: branches/5.2.x/units/currencies/currencies_event_handler.php =================================================================== diff -u -N -r14849 -r14986 --- branches/5.2.x/units/currencies/currencies_event_handler.php (.../currencies_event_handler.php) (revision 14849) +++ branches/5.2.x/units/currencies/currencies_event_handler.php (.../currencies_event_handler.php) (revision 14986) @@ -1,6 +1,6 @@ Array('self' => 'add|edit'), - 'OnUpdateRates' => Array('self' => 'advanced:update_rate|add|edit'), - 'OnDisableUnused' => Array('self' => 'edit'), + 'OnUpdateRate' => Array ('self' => 'add|edit'), + 'OnUpdateRates' => Array ('self' => 'advanced:update_rate|add|edit'), + 'OnDisableUnused' => Array ('self' => 'edit'), // front - 'OnChangeCurrency' => Array('self' => true), - 'OnItemBuild' => Array('self' => true), + 'OnChangeCurrency' => Array ('self' => true), + 'OnItemBuild' => Array ('self' => true), ); $this->permMapping = array_merge($this->permMapping, $permissions); } /** - * Returns ID of current item to be edited - * by checking ID passed in get/post as prefix_id - * or by looking at first from selected ids, stored. - * Returned id is also stored in Session in case - * it was explicitly passed as get/post - * - * @param kEvent $event - * @return int - */ - function getPassedID(&$event) - { - if ( $event->Special == 'current' ) { - return Array ('ISO' => $this->Application->RecallVar('curr_iso')); - } - - return parent::getPassedID($event); + * Returns ID of current item to be edited + * by checking ID passed in get/post as prefix_id + * or by looking at first from selected ids, stored. + * Returned id is also stored in Session in case + * it was explicitly passed as get/post + * + * @param kEvent $event + * @return int + * @access public + */ + public function getPassedID(kEvent &$event) + { + if ( $event->Special == 'current' ) { + return Array ('ISO' => $this->Application->RecallVar('curr_iso')); } + return parent::getPassedID($event); + } + /** * Enter description here... * @@ -116,8 +120,10 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetCustomQuery(&$event) + protected function SetCustomQuery(kEvent &$event) { + parent::SetCustomQuery($event); + $object =& $event->getObject(); /* @var $object kDBList */