Index: branches/5.3.x/core/install.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/install.php	(.../install.php)	(revision 15677)
+++ branches/5.3.x/core/install.php	(.../install.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: install.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -922,12 +922,13 @@
 				case 'select_theme':
 					// 1. mark theme, that user is selected
 					$theme_id = $this->GetVar('theme');
-					$theme_table = $this->Application->getUnitOption('theme', 'TableName');
-					$theme_idfield = $this->Application->getUnitOption('theme', 'IDField');
+					$theme_config = $this->Application->getUnitConfig('theme');
+					$theme_table = $theme_config->getTableName();
+					$theme_id_field = $theme_config->getIDField();
 
 					$sql = 'UPDATE ' . $theme_table . '
 							SET Enabled = 1, PrimaryTheme = 1
-							WHERE ' . $theme_idfield . ' = ' . $theme_id;
+							WHERE ' . $theme_id_field . ' = ' . $theme_id;
 					$this->Conn->Query($sql);
 
 					$this->toolkit->rebuildThemes(); // rescan theme to create structure after theme is enabled !!!
@@ -936,7 +937,7 @@
 					if ($this->Application->GetVar('install_demo_data')) {
 						$sql = 'SELECT Name
 								FROM ' . $theme_table . '
-								WHERE ' . $theme_idfield . ' = ' . $theme_id;
+								WHERE ' . $theme_id_field . ' = ' . $theme_id;
 						$theme_name = $this->Conn->GetOne($sql);
 						$site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath') . '/';