Index: branches/5.3.x/core/units/permissions/permissions_tag_processor.php =================================================================== diff -u -N -r15483 -r15698 --- branches/5.3.x/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 15483) +++ branches/5.3.x/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 15698) @@ -1,6 +1,6 @@ Application->getUnitOption($section_data['perm_prefix'].'.main', 'PermSection'); + $section_name = $this->Application->getUnitConfig($section_data['perm_prefix'])->getPermSectionByName('main'); } $permissions_helper = $this->Application->recallObject('PermissionsHelper'); @@ -95,7 +95,7 @@ $prefix = $this->Application->GetVar('item_prefix'); $module = $this->Application->findModule('Var', $prefix, 'Name'); - $perm_live_table = $this->Application->getUnitOption('c-perm', 'TableName'); + $perm_live_table = $this->Application->getUnitConfig('c-perm')->getTableName(); $perm_temp_table = $this->Application->GetTempName($perm_live_table, 'prefix:'.$this->Prefix); if ($category->GetID() == 0) { @@ -177,7 +177,7 @@ $ret = ''; $block_params = $params; foreach ($this->Application->ModuleInfo as $module_name => $module_data) { - if (!$this->Application->prefixRegistred($module_data['Var']) || !$this->Application->getUnitOption($module_data['Var'], 'CatalogItem')) continue; + if (!$this->Application->prefixRegistred($module_data['Var']) || !$this->Application->getUnitConfig($module_data['Var'])->getCatalogItem()) continue; $params['item_prefix'] = $module_data['Var']; $ret .= $this->Application->IncludeTemplate($params); } @@ -201,15 +201,14 @@ if ( $category_path === false ) { // not cached if ( $category_id > 0 ) { - $id_field = $this->Application->getUnitOption('c', 'IDField'); - $table_name = $this->Application->getUnitOption('c', 'TableName'); - $ml_formatter = $this->Application->recallObject('kMultiLanguage'); /* @var $ml_formatter kMultiLanguage */ + $categories_config = $this->Application->getUnitConfig('c'); + $sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . ' - FROM ' . $table_name . ' - WHERE ' . $id_field . ' = ' . $category_id; + FROM ' . $categories_config->getTableName() . ' + WHERE ' . $categories_config->getIDField() . ' = ' . $category_id; $cached_navbar = preg_replace('/^Content(&\|&){0,1}/i', '', $this->Conn->GetOne($sql)); $category_path = trim($this->CategoryPath(Array ('cat_id' => 0)) . ' > ' . str_replace('&|&', ' > ', $cached_navbar), ' > '); }