From c19cf2d0d8b79c391e6ea3099cc669e51aaadfcc Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Sun, 4 Jul 2010 22:44:39 +0000
Subject: [PATCH] Fixed issue #4456: Error message: Invalid argument... when
 testing inactive survey and a question is missing necessary subquestions

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8893 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 common.php |  2 +-
 qanda.php  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common.php b/common.php
index 1576fbb4960..07e6a41939e 100644
--- a/common.php
+++ b/common.php
@@ -7497,6 +7497,6 @@ function getSubQuestions($sid, $qid) {
 	    $subquestions[$sid] = $resultset;
     }
     if (isset($subquestions[$sid][$qid])) return $subquestions[$sid][$qid];
-    return false;
+    return array();
 }
 // Closing PHP tag intentionally left out - yes, it is okay
\ No newline at end of file
diff --git a/qanda.php b/qanda.php
index dec400bd3b2..c443a2ac014 100644
--- a/qanda.php
+++ b/qanda.php
@@ -714,10 +714,10 @@ function retrieveAnswers($ia, $notanswered=null, $notvalidated=null)
             $values=do_array_increasesamedecrease($ia);
             break;
         case 'F': //ARRAY (Flexible) - Row Format
-            $values=do_array_flexible($ia);
+            $values=do_array($ia);
             break;
         case 'H': //ARRAY (Flexible) - Column Format
-            $values=do_array_flexiblecolumns($ia);
+            $values=do_arraycolumns($ia);
             break;
         case ':': //ARRAY (Multi Flexi) 1 to 10
             $values=do_array_multiflexi($ia);
@@ -726,7 +726,7 @@ function retrieveAnswers($ia, $notanswered=null, $notvalidated=null)
             $values=do_array_multitext($ia);  //It's like the "5th element" movie, come to life
             break;
         case '1': //Array (Flexible Labels) dual scale
-            $values=do_array_flexible_dual($ia);
+            $values=do_array_dual($ia);
             break;
     } //End Switch
 
@@ -5203,7 +5203,7 @@ function do_array_increasesamedecrease($ia)
 }
 
 // ---------------------------------------------------------------
-function do_array_flexible($ia)
+function do_array($ia)
 {
     global $dbprefix, $connect, $thissurvey, $clang;
     global $shownoanswer;
@@ -5946,7 +5946,7 @@ function do_array_multiflexi($ia)
 
 
 // ---------------------------------------------------------------
-function do_array_flexiblecolumns($ia)
+function do_arraycolumns($ia)
 {
     global $dbprefix;
     global $shownoanswer;
@@ -6099,7 +6099,7 @@ function do_array_flexiblecolumns($ia)
 
 
 // ---------------------------------------------------------------
-function do_array_flexible_dual($ia)
+function do_array_dual($ia)
 {
     global $dbprefix, $connect, $thissurvey, $clang;
     global $shownoanswer;