Index: branches/5.2.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r14999 -r15012
--- branches/5.2.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 14999)
+++ branches/5.2.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 15012)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 14999 2012-01-06 13:45:06Z alex $
+* @version	$Id: install_toolkit.php 15012 2012-01-06 20:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -141,7 +141,7 @@
 			/* @var $prerequisite_object InPortalPrerequisites */
 
 			// some errors possible
-			return $prerequisite_object->CheckPrerequisites($versions, $mode);
+			return is_object($prerequisite_object) ? $prerequisite_object->CheckPrerequisites($versions, $mode) : Array ();
 		}
 
 		/**
@@ -156,15 +156,14 @@
 			$prerequisite_object =& $this->getPrerequisiteObject($module_path);
 			/* @var $prerequisite_object InPortalPrerequisites */
 
-			return $prerequisite_object->$method();
+			return is_object($prerequisite_object) ? $prerequisite_object->$method() : false;
 		}
 
 		/**
 		 * Returns prerequisite object to be used for checks
 		 *
 		 * @param string $module_path
-		 * @param string $versions
-		 * @return bool
+		 * @return kHelper
 		 * @access protected
 		 */
 		protected function &getPrerequisiteObject($module_path)
@@ -231,7 +230,7 @@
 		function saveConfigValues($config)
 		{
 			foreach ($config as $config_var => $value) {
-				$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationValues
+				$sql = 'UPDATE ' . TABLE_PREFIX . 'SystemSettings
 						SET VariableValue = ' . $this->Conn->qstr($value) . '
 						WHERE VariableName = ' . $this->Conn->qstr($config_var);
 				$this->Conn->Query($sql);
@@ -851,14 +850,14 @@
 			$db =& $this->Application->GetADODBConnection();
 
 			$sql = 'SELECT FieldName, CustomFieldId
-					FROM ' . TABLE_PREFIX . 'CustomField
+					FROM ' . TABLE_PREFIX . 'CustomFields
 					WHERE Type = ' . $item_type . ' AND IsSystem = 0'; // config is not read here yet :( $this->Application->getUnitOption('p', 'ItemType');
 			$custom_fields = $db->GetCol($sql, 'CustomFieldId');
 
 			foreach ($custom_fields as $cf_id => $cf_name) {
 				$sql = 'UPDATE ' . TABLE_PREFIX . 'SearchConfig
 						SET CustomFieldId = ' . $cf_id . '
-						WHERE (TableName = "CustomField") AND (LOWER(ModuleName) = "' . $module_name . '") AND (FieldName = ' . $db->qstr($cf_name) . ')';
+						WHERE (TableName = "CustomFields") AND (LOWER(ModuleName) = "' . $module_name . '") AND (FieldName = ' . $db->qstr($cf_name) . ')';
 				$db->Query($sql);
 			}