Index: branches/RC/core/units/categories/categories_event_handler.php =================================================================== diff -u -N -r11586 -r11610 --- branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11586) +++ branches/RC/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 11610) @@ -162,10 +162,8 @@ $object =& $event->getObject(); /* @var $object kDBList */ - /*if (!$this->Application->IsAdmin()) { - // don't show categories visible in menu as sub-categories - $object->addFilter('system_categories', '%1$s.IsMenu = 0'); - }*/ + // don't show "Content" category in advanced view + $object->addFilter('system_categories', '%1$s.Status <> 4'); // show system templates from current theme only + all virtual templates $object->addFilter('theme_filter', '%1$s.ThemeId = ' . $this->_getCurrentThemeId() . ' OR %1$s.ThemeId = 0'); @@ -407,7 +405,7 @@ $themes_helper =& $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ - return $themes_helper->getCurrentThemeId(); + return (int)$themes_helper->getCurrentThemeId(); } /** @@ -1350,7 +1348,7 @@ $theme_id = $this->_getCurrentThemeId(); } - $root_category = $this->Application->findModule('Name', 'Proj-CMS', 'RootCat'); + $root_category = $this->Application->findModule('Name', 'Core', 'RootCat'); $page_category = $this->Application->GetVar('m_cat_id'); if (!$page_category) { $page_category = $root_category; @@ -1607,7 +1605,7 @@ return ; } - $root_category = $this->Application->findModule('Name', 'Proj-CMS', 'RootCat'); + $root_category = $this->Application->findModule('Name', 'Core', 'RootCat'); // set root category $section_ajustments = $this->Application->getUnitOption($event->Prefix, 'SectionAdjustments');