Fixed issue: High memory usage on db upgrade from older versions

LimeSurvey · Sep 18, 2014 · ac074d1 · ac074d1
1 parent d0c51fc
commit ac074d1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -8018,15 +8018,15 @@ private static function getConditionsForEM($surveyid=NULL, $qid=NULL)
             }
 
             $query = "SELECT DISTINCT c.*, q.sid, q.type
-                FROM conditions AS c
-                LEFT JOIN questions q ON c.cqid=q.qid
-                LEFT JOIN questions qa ON c.qid=qa.qid
+                FROM {{conditions}} AS c
+                LEFT JOIN {{questions}} q ON c.cqid=q.qid
+                LEFT JOIN {{questions}} qa ON c.qid=qa.qid
                 WHERE {$where} 1=1
                 UNION
                 SELECT DISTINCT c.*, q.sid, '' AS TYPE
-                FROM conditions AS c
-                LEFT JOIN questions q ON c.cqid=q.qid
-                LEFT JOIN questions qa ON c.qid=qa.qid
+                FROM {{conditions}} AS c
+                LEFT JOIN {{questions}} q ON c.cqid=q.qid
+                LEFT JOIN {{questions}} qa ON c.qid=qa.qid
                 WHERE {$where} c.cqid = 0";
 
             $databasetype = Yii::app()->db->getDriverName();