Merge pull request #101 from mfaber/zerovalue_master

Fixed issue #8065: Answer code conversion to '0'
LimeSurvey · Aug 11, 2013 · 3b89c86 · 3b89c86
2 parents 6739dfb + 667fb53
commit 3b89c86
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -1596,15 +1596,16 @@ function fixMovedQuestionConditions($qid,$oldgid,$newgid) //Function rewrites th
 function returnGlobal($stringname,$bRestrictToString=false)
 {
     $urlParam=Yii::app()->request->getParam($stringname); 
-    if(!$urlParam && $aCookies=Yii::app()->request->getCookies() && $stringname!='sid')
+    if(!isset($urlParam) && $aCookies=Yii::app()->request->getCookies() && $stringname!='sid')
     {
         if(isset($aCookies[$stringname]))
         {
             $urlParam = $aCookies[$stringname];
         } 
     }
-    $bUrlParamIsArray=is_array($urlParam);
-    if ($urlParam && (!$bUrlParamIsArray || !$bRestrictToString))
+
+    $bUrlParamIsArray=is_array($urlParam);// Needed to array map or if $bRestrictToString
+    if (isset($urlParam) && $stringname!='' && (!$bUrlParamIsArray || !$bRestrictToString))
     {
         if ($stringname == 'sid' || $stringname == "gid" || $stringname == "oldqid" ||
         $stringname == "qid" || $stringname == "tid" ||