From 80ee8ad3dbb09a5e94b583f0b95cf4e5b01028ec Mon Sep 17 00:00:00 2001
From: Sam Mousa <sam@mousa.nl>
Date: Thu, 9 Jan 2014 11:49:52 +0100
Subject: [PATCH] Dev Override added for defaultController setting. Removed
 unneeded config from sample files.

---
 application/config/config-sample-dblib.php  | 11 -----------
 application/config/config-sample-mysql.php  | 11 -----------
 application/config/config-sample-pgsql.php  | 11 -----------
 application/config/config-sample-sqlsrv.php | 11 -----------
 application/config/internal.php             |  6 +++++-
 5 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/application/config/config-sample-dblib.php b/application/config/config-sample-dblib.php
index ec08f1ba04a..1b2d2e9cbe5 100644
--- a/application/config/config-sample-dblib.php
+++ b/application/config/config-sample-dblib.php
@@ -22,18 +22,7 @@
 |
 */
 return array(
-    'basePath' => dirname(dirname(__FILE__)),
-    'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime',
     'name' => 'LimeSurvey',
-    'defaultController' => 'survey',
-
-    'import' => array(
-        'application.core.*',
-        'application.models.*',
-        'application.controllers.*',
-        'application.modules.*',
-    ),
-
     'components' => array(
         'db' => array(
             'connectionString' => 'dblib:host=localhost;dbname=limesurvey',
diff --git a/application/config/config-sample-mysql.php b/application/config/config-sample-mysql.php
index 039f2881d00..7e97fbae570 100644
--- a/application/config/config-sample-mysql.php
+++ b/application/config/config-sample-mysql.php
@@ -22,18 +22,7 @@
 |
 */
 return array(
-	'basePath' => dirname(dirname(__FILE__)),
-	'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime',
 	'name' => 'LimeSurvey',
-	'defaultController' => 'survey',
-
-    'import' => array(
-        'application.core.*',
-        'application.models.*',
-        'application.controllers.*',
-        'application.modules.*',
-    ),
-
 	'components' => array(
 		'db' => array(
 			'connectionString' => 'mysql:host=localhost;port=3306;dbname=limesurvey',
diff --git a/application/config/config-sample-pgsql.php b/application/config/config-sample-pgsql.php
index 2f5190be306..7c0f34b9257 100644
--- a/application/config/config-sample-pgsql.php
+++ b/application/config/config-sample-pgsql.php
@@ -22,18 +22,7 @@
 |
 */
 return array(
-	'basePath' => dirname(dirname(__FILE__)),
-	'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime',
 	'name' => 'LimeSurvey',
-	'defaultController' => 'survey',
-	
-	'import' => array(
-		'application.core.*',
-		'application.models.*',
-		'application.controllers.*',
-		'application.modules.*',
-	),
-	
 	'components' => array(
 		'db' => array(
 			'connectionString' => 'pgsql:host=localhost;port=5432;user=postgres;password=somepassword;dbname=limesurvey;',
diff --git a/application/config/config-sample-sqlsrv.php b/application/config/config-sample-sqlsrv.php
index 08d8ec24ed2..21605114a5c 100644
--- a/application/config/config-sample-sqlsrv.php
+++ b/application/config/config-sample-sqlsrv.php
@@ -22,18 +22,7 @@
 |
 */
 return array(
-    'basePath' => dirname(dirname(__FILE__)),
-    'runtimePath' => dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'runtime',
     'name' => 'LimeSurvey',
-    'defaultController' => 'survey',
-    
-    'import' => array(
-        'application.core.*',
-        'application.models.*',
-        'application.controllers.*',
-        'application.modules.*',
-    ),
-    
     'components' => array(
         'db' => array(
             'connectionString' => 'sqlsrv:Server=localhost;Database=limesurvey',
diff --git a/application/config/internal.php b/application/config/internal.php
index 9e4d037176c..ccd483e935b 100644
--- a/application/config/internal.php
+++ b/application/config/internal.php
@@ -65,6 +65,10 @@
     $userConfig = require(dirname(__FILE__) . '/config.php');
 }
 
-return CMap::mergeArray($internalConfig, $userConfig);
+$result = CMap::mergeArray($internalConfig, $userConfig);
+/**
+ * Some workarounds for erroneous settings in user config.php.
+ */
+$result['defaultController'] = $internalConfig['defaultController'];
 /* End of file internal.php */
 /* Location: ./application/config/internal.php */