Index: branches/5.3.x/core/units/helpers/template_helper.php
===================================================================
diff -u -r15483 -r15698
--- branches/5.3.x/core/units/helpers/template_helper.php	(.../template_helper.php)	(revision 15483)
+++ branches/5.3.x/core/units/helpers/template_helper.php	(.../template_helper.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: template_helper.php 15137 2012-03-04 08:06:21Z alex $
+* @version	$Id: template_helper.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -94,11 +94,13 @@
 
 		function _getThemeName()
 		{
+			$config = $this->Application->getUnitConfig('theme');
 			$theme_id = (int)$this->Application->GetVar('theme_id');
 
 			$sql = 'SELECT Name
-					FROM ' . $this->Application->getUnitOption('theme', 'TableName') . '
-					WHERE ' . $this->Application->getUnitOption('theme', 'IDField') . ' = ' . $theme_id;
+					FROM ' . $config->getTableName() . '
+					WHERE ' . $config->getIDField() . ' = ' . $theme_id;
+
 			return $this->Conn->GetOne($sql);
 		}