Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Question_…

…Objects Conflicts: application/controllers/admin/quotas.php
LimeSurvey · Aug 19, 2012 · 1aa2d1d · 1aa2d1d
2 parents 4d95031 + a1185d3
commit 1aa2d1d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/controllers/admin/quotas.php b/application/controllers/admin/quotas.php
@@ -362,7 +362,7 @@ function new_answer($iSurveyId, $sSubAction = 'new_answer')
                 $quota_name = $aQuotaDetails['name'];
             }
 
-            $result = Questions::model()->findAllByAttributes(array('type' => array('G', 'M', 'Y', 'A', 'B', 'I', 'L', 'O', '!'), 'sid' => $iSurveyId, 'language' => $sBaseLang)); //AJS
+            $result = Questions::model()->findAllByAttributes(array('type' => array('G', 'M', 'Y', 'A', 'B', 'I', 'L', 'O', '!'), 'sid' => $iSurveyId, 'language' => $sBaseLang, 'parent_qid' => 0)); //AJS
             if (empty($result))
             {
                 $aViewUrls[] = 'newanswererror_view';