Merge pull request #307 from gmambro/2.06

Fixed issue #9595: PHP error when deleting a condition
LimeSurvey · Apr 7, 2015 · ccd239e · ccd239e
2 parents a03a690 + 1932502
commit ccd239e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -777,9 +777,12 @@ public static function UpgradeConditionsToRelevance($surveyId=NULL, $qid=NULL)
             foreach ($aSurveyIDs as $surveyId )     {
                 // echo $surveyId.'<br>';flush();@ob_flush();
                 $releqns = self::ConvertConditionsToRelevance($surveyId,$qid);
-                foreach ($releqns as $key=>$value) {
-                    $sQuery = "UPDATE {{questions}} SET relevance=".Yii::app()->db->quoteValue($value)." WHERE qid=".$key;
-                    Yii::app()->db->createCommand($sQuery)->execute();
+                if ( !empty( $releqns) ) {
+                    foreach ($releqns as $key=>$value)
+                    {
+                        $sQuery = "UPDATE {{questions}} SET relevance=".Yii::app()->db->quoteValue($value)." WHERE qid=".$key;
+                        Yii::app()->db->createCommand($sQuery)->execute();
+                    }
                 }
             }