Index: trunk/core/units/general/cat_event_handler.php =================================================================== diff -u -N -r8719 -r8779 --- trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 8719) +++ trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 8779) @@ -2049,22 +2049,6 @@ * * @param kEvent $event */ - function OnMassDelete(&$event) - { - parent::OnMassDelete($event); - - if ($event->status == erSUCCESS && !$this->Application->IsAdmin()) { - $event->SetRedirectParam('pass', 'm'); - $event->SetRedirectParam('m_cat_id', 0); - } - } - - - /** - * Deletes items & preserves clean env - * - * @param kEvent $event - */ function OnDelete(&$event) { parent::OnDelete($event); Index: trunk/core/units/general/helpers/category_helper.php =================================================================== diff -u -N -r8751 -r8779 --- trunk/core/units/general/helpers/category_helper.php (.../category_helper.php) (revision 8751) +++ trunk/core/units/general/helpers/category_helper.php (.../category_helper.php) (revision 8779) @@ -31,6 +31,10 @@ $category_path = $this->getCategoryParentPath($main_category_id); $module_info = $this->getCategoryModule($params, array_keys($category_path)); + if (!$module_info) { + continue; + } + $module_prefix = $module_info['Var']; $object =& $this->Application->recallObject($module_prefix); /* @var $object kCatDBItem */ Index: trunk/core/units/general/helpers/permissions_helper.php =================================================================== diff -u -N -r8757 -r8779 --- trunk/core/units/general/helpers/permissions_helper.php (.../permissions_helper.php) (revision 8757) +++ trunk/core/units/general/helpers/permissions_helper.php (.../permissions_helper.php) (revision 8779) @@ -442,6 +442,11 @@ if (preg_match('/(.*)\.VIEW$/', $name) && ($type == 0)) { // cached view permission of category: begin + if (strpos($cat_id, '|') !== false) { + $category_path = explode('|', substr($cat_id, 1, -1)); + $cat_id = end($category_path); + } + $sql = 'SELECT PermissionConfigId FROM '.TABLE_PREFIX.'PermissionConfig WHERE PermissionName = '.$this->Conn->qstr($name);