Index: branches/5.1.x/core/units/configuration/configuration_config.php
===================================================================
diff -u -N -r13159 -r13188
--- branches/5.1.x/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 13159)
+++ branches/5.1.x/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 13188)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_config.php 13159 2010-02-24 10:45:00Z alex $
+* @version	$Id: configuration_config.php 13188 2010-03-10 09:06:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -50,49 +50,32 @@
 		'TableName' => TABLE_PREFIX . 'ConfigurationValues',
 
 		'ListSQLs' => Array (
-			'' => '	SELECT %1$s.* %2$s
-					FROM ' . TABLE_PREFIX . 'ConfigurationAdmin ca
-					LEFT JOIN %1$s USING(VariableName)'
+			'' => 'SELECT %1$s.* %2$s FROM %1$s'
 		),
 
-
-
 		'ListSortings' => Array (
 			'' => Array (
 				'Sorting' => Array ('DisplayOrder' => 'asc', 'GroupDisplayOrder' => 'asc'),
 			)
 		),
 
-		'CalculatedFields' => Array (
-			''	=>	Array (
-				'heading' => 'ca.heading',
-				'prompt' => 'ca.prompt',
-				'element_type' => 'ca.element_type',
-				'Validation' => 'ca.Validation',
-				'ValueList' => 'ca.ValueList',
-				'DisplayOrder' => 'ca.DisplayOrder',
-				'GroupDisplayOrder' => 'ca.GroupDisplayOrder',
-				'Install' => 'ca.Install',
-			),
-		),
-
   		'Fields' => Array (
-			'VariableId'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			'VariableName'	=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-			'VariableValue' =>	Array ('type' => 'string', 'default' => null),
-			'ModuleOwner'	=>	Array ('type' => 'string', 'default' => 'In-Portal'),
-			'Section'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+			'VariableId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+			'VariableName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+			'VariableValue' => Array ('type' => 'string', 'default' => NULL),
+			'ModuleOwner' => Array ('type' => 'string', 'default' => 'In-Portal'),
+			'Section' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+			'Heading' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+	        'Prompt' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+	        'ElementType' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+	        'Validation' => Array ('type' => 'string', 'default' => NULL),
+	        'ValueList' => Array ('type' => 'string', 'default' => NULL),
+	        'DisplayOrder' => Array ('type' => 'float', 'not_null' => 1, 'default' => 0),
+	        'GroupDisplayOrder' => Array ('type' => 'float', 'not_null' => 1, 'default' => 0),
+	        'Install' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1),
 		),
 
 		'VirtualFields' => Array (
-			'heading'			=>	Array ('type' => 'string', 'default' => ''),
-	        'prompt'			=>	Array ('type' => 'string', 'default' => ''),
-	        'element_type'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-	        'Validation'		=>	Array ('type' => 'string', 'default' => ''),
-	        'ValueList'			=>	Array ('type' => 'string', 'default' => ''),
-	        'DisplayOrder'		=>	Array ('type' => 'double', 'not_null' => '1', 'default' => 0),
-	        'GroupDisplayOrder'	=>	Array ('type' => 'double', 'not_null' => '1', 'default' => 0),
-	        'Install'			=>	Array ('type' => 'int', 'not_null' => '1', 'default' => 1),
 	        'DirectOptions'		=>	Array ('type' => 'string', 'default' => ''),
 		),
 	);
\ No newline at end of file