Index: branches/RC/core/units/general/cat_event_handler.php =================================================================== diff -u -N -r11394 -r11538 --- branches/RC/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 11394) +++ branches/RC/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 11538) @@ -1686,31 +1686,24 @@ */ function OnExport(&$event) { - // use old fasion (in-portal) grid - $selector_name = $this->Application->getUnitOption($event->Prefix, 'CatalogSelectorName'); - if ($selector_name) { - $selected_ids = $this->Application->GetVar($selector_name); + $selected_ids = $this->StoreSelectedIDs($event); + if (implode(',', $selected_ids) == '') { + // K4 fix when no ids found bad selected ids array is formed + $selected_ids = false; } - else { - $selected_ids = $this->StoreSelectedIDs($event); - if (implode(',', $selected_ids) == '') { - // K4 fix when no ids found bad selected ids array is formed - $selected_ids = false; - } - } - $selected_cats_ids = $this->Application->GetVar('export_categories'); $this->Application->StoreVar($event->Prefix.'_export_ids', $selected_ids ? implode(',', $selected_ids) : '' ); $this->Application->StoreVar($event->Prefix.'_export_cats_ids', $selected_cats_ids); $export_helper =& $this->Application->recallObject('CatItemExportHelper'); - $event->redirect = $export_helper->getModuleFolder($event).'/export'; + /* @var $export_helper kCatDBItemExportHelper */ - $redirect_params = Array( 'm_opener' => 'd', - $this->Prefix.'.export_event' => 'OnNew', - 'pass' => 'all,'.$this->Prefix.'.export'); + $redirect_params = Array ( + $this->Prefix.'.export_event' => 'OnNew', + 'pass' => 'all,'.$this->Prefix.'.export' + ); $event->setRedirectParams($redirect_params); }