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

LimeSurvey · Dec 22, 2012 · 214fdd5 · 214fdd5
1 parent 26f4206
commit 214fdd5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -78,8 +78,12 @@ public function __construct($config = null)
             }
         }
 
-        $config['components']['request']=array(
-            'class'=>'LSHttpRequest',
+        if (!isset($config['components']['request']))
+        {
+            $config['components']['request']=array();
+        }
+        $config['components']['request']=array_merge_recursive($config['components']['request'],array(
+            'class'=>'HttpRequest',
             'noCsrfValidationRoutes'=>array(
 //              '^services/wsdl.*$'   // Set here additional regex rules for routes not to be validate 
                 'getTokens_json',
@@ -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.