Fixed issue #7108: 'hostinfo' parameter in config.php not working

LimeSurvey · Dec 22, 2012 · 037d481 · 037d481
1 parent b52311d
commit 037d481
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -78,7 +78,11 @@ public function __construct($config = null)
             }
         }
 
-        $config['components']['request']=array(
+        if (!isset($config['components']['request']))
+        {
+            $config['components']['request']=array();
+        }
+        $config['components']['request']=array_merge_recursive($config['components']['request'],array(
             'class'=>'LSHttpRequest',
             'noCsrfValidationRoutes'=>array(
 //              '^services/wsdl.*$'   // Set here additional regex rules for routes not to be validate 
@@ -88,7 +92,7 @@ public function __construct($config = null)
             ),
             'enableCsrfValidation'=>false,    // Enable to activate CSRF protection
             'enableCookieValidation'=>false   // Enable to activate cookie protection
-        );
+        ));
 
         parent::__construct($config);
         // Load the default and environmental settings from different files into self.