Index: branches/5.3.x/core/units/categories/categories_item.php
===================================================================
diff -u -N -r15483 -r15698
--- branches/5.3.x/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 15483)
+++ branches/5.3.x/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_item.php 15390 2012-06-12 16:25:51Z alex $
+* @version	$Id: categories_item.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -43,7 +43,7 @@
 				}
 
 				$sql = 'SELECT ' . implode(', ', $select_fields) . '
-						FROM ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
+						FROM ' . $this->getUnitConfig()->getTableName() . '
 						WHERE CategoryId = ' . $parent_id;
 				$parent_cache[$parent_id] = $this->Conn->GetRow($sql);
 			}
@@ -221,7 +221,7 @@
 		public function IsNewItem()
 		{
 			if ( $this->IsRoot() && $this->Prefix == 'c' ) {
-				$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
+				$title_field = $this->getUnitConfig()->getTitleField();
 				$category_name = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name');
 				$this->SetDBField($title_field, $category_name);
 
@@ -243,7 +243,7 @@
 		public function NameCopy($master=null, $foreign_key=null, $title_field=null, $format='Copy %1$s of %2$s')
 		{
 			if (!isset($title_field)) {
-				$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
+				$title_field = $this->getUnitConfig()->getTitleField();
 				if (!$title_field || isset($this->CalculatedFields[$title_field]) ) return;
 			}