Index: branches/5.3.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r15690 -r15698
--- branches/5.3.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 15690)
+++ branches/5.3.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 15690 2013-02-18 21:34:24Z alex $
+* @version	$Id: admin_tag_processor.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -396,37 +396,47 @@
 			$ret = '';
 			$special = isset($params['special']) ? $params['special'] : '';
 			$replace_main = isset($params['replace_m']) && $params['replace_m'];
-			$skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array();
+			$skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array ();
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$prefix = $module_info['Var'];
 
-				if ($prefix == 'm' && $replace_main) {
+				if ( $prefix == 'm' && $replace_main ) {
 					$prefix = 'c';
 				}
 
-				if (in_array($prefix, $skip_prefixes) || !$this->Application->prefixRegistred($prefix) || !$this->Application->getUnitOption($prefix, 'CatalogItem')) {
+				if ( $this->Application->prefixRegistred($prefix) ) {
+					$config = $this->Application->getUnitConfig($prefix);
+				}
+				else {
+					$config = null;
+				}
+
+				if ( in_array($prefix, $skip_prefixes) || !is_object($config) || !$config->getCatalogItem() ) {
 					continue;
 				}
 
-				$icon = $this->Application->getUnitOption($prefix, 'CatalogTabIcon');
-				if (strpos($icon, ':') !== false) {
+				$icon = $config->getCatalogTabIcon();
+
+				if ( strpos($icon, ':') !== false ) {
 					list ($icon_module, $icon) = explode(':', $icon, 2);
 				}
 				else {
 					$icon_module = 'core';
 				}
 
-				$label = $this->Application->getUnitOption($prefix, $params['title_property']);
+				$label = $config->getSetting($params['title_property']);
 				$block_params['title'] = $label;
 				$block_params['prefix'] = $prefix;
 				$block_params['icon_module'] = $icon_module;
 				$block_params['icon'] = $icon;
+
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
+
 			return $ret;
 		}
 
@@ -438,8 +448,10 @@
 		 */
 		function CatalogTab($params)
 		{
-			$icon = $this->Application->getUnitOption($params['prefix'], 'CatalogTabIcon');
-			if (strpos($icon, ':') !== false) {
+			$config = $this->Application->getUnitConfig($params['prefix']);
+			$icon = $config->getCatalogTabIcon();
+
+			if ( strpos($icon, ':') !== false ) {
 				list ($icon_module, $icon) = explode(':', $icon, 2);
 			}
 			else {
@@ -450,7 +462,7 @@
 			$block_params['name'] = $params['render_as'];
 			$block_params['icon_module'] = $icon_module;
 			$block_params['icon'] = $icon;
-			$block_params['title'] = $this->Application->getUnitOption($params['prefix'], $params['title_property']);
+			$block_params['title'] = $config->getSetting($params['title_property']);
 
 			return $this->Application->ParseBlock($block_params);
 		}