Dev: Add transaction object; only drop table if it exists

LimeSurvey · Jul 14, 2017 · c6f560b · c6f560b
1 parent 057674a
commit c6f560b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -361,10 +361,18 @@ function createSurveyMenuTable293($oDB) {
     }
 }
 
-function upgradeTemplateTables295($oDB){
+/**
+ * @param $oDB
+ * @return void
+ */
+function upgradeTemplateTables295($oDB)
+{
+    $oTransaction = $oDB->beginTransaction();
 
-    // drop the old survey rights table
-    $oDB->createCommand()->dropTable('{{templates}}');
+    // Drop the old survey rights table.
+    if (tableExists('{templates}')) {
+        $oDB->createCommand()->dropTable('{{templates}}');
+    }
 
     // Create templates table
     $oDB->createCommand()->createTable('{{templates}}', array(