dev: merging develop with updatedb conflicts

LimeSurvey · Jan 14, 2021 · 025223a · 025223a
1 parent 58806ca
commit 025223a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,7 +12,7 @@
  */
 
 $config['versionnumber'] = '4.4.0-RC3';
-$config['dbversionnumber'] = 436;
+$config['dbversionnumber'] = 437;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -3469,8 +3469,7 @@ function ($v) {
             $oTransaction->commit();
         }
 
-
-        if($iOldDBVersion < 436){
+        if($iOldDBVersion < 437){
             $oTransaction = $oDB->beginTransaction();
             //refactore controller assessment (surveymenu_entry link changes to new controller rout)
             $oDB->createCommand()->update(
@@ -3480,7 +3479,7 @@ function ($v) {
                 ),
                 "name='assessments'"
             );
-            $oDB->createCommand()->update('{{settings_global}}', array('stg_value' => 436), "stg_name='DBVersion'");
+            $oDB->createCommand()->update('{{settings_global}}', array('stg_value' => 437), "stg_name='DBVersion'");
             $oTransaction->commit();
         }
     } catch (Exception $e) {