From 87aca2e8872e64d9df0062303022a3d7d413d0d8 Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Fri, 1 Dec 2017 16:56:12 +0100
Subject: [PATCH] Dev: Don't hardcode dbversion in create-database.php

---
 application/config/version.php | 2 +-
 installer/create-database.php  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/config/version.php b/application/config/version.php
index 6982093d840..2a4ee978bc7 100644
--- a/application/config/version.php
+++ b/application/config/version.php
@@ -14,7 +14,7 @@
 
 $config['versionnumber'] = '3.0.0-RC.3'; //The current version of this branch
 $config['masterversion'] = '2.67.3'; //The current masters version merged into this branch
-$config['dbversionnumber'] = 331;
+$config['dbversionnumber'] = 329;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '3018';
diff --git a/installer/create-database.php b/installer/create-database.php
index 810cf6f97b4..0460bbc64ec 100644
--- a/installer/create-database.php
+++ b/installer/create-database.php
@@ -11,7 +11,8 @@ function createDatabase($oDB){
     */
 
     ////// Current database version: //////
-    $databaseCurrentVersion = "329";
+    $version = require(\Yii::app()->getBasePath() . '/config/version.php');
+    $databaseCurrentVersion = $version['dbversionnumber'];
     ///////////////////////////////////////
 
     Yii::app()->loadHelper('database');