From 4d4c39be8eb510900c158aa5492c967a85e5ede2 Mon Sep 17 00:00:00 2001 From: Ulrich Block Date: Wed, 17 Aug 2016 21:48:14 +0200 Subject: [PATCH] Versioning with Github #915 --- install/update.php | 8 ++++++-- install/update_developer.php | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/install/update.php b/install/update.php index bf7bc94d..9161f3fa 100644 --- a/install/update.php +++ b/install/update.php @@ -87,12 +87,16 @@ if (!isset($sql)) { } } -function versioncheck ($current, $new ,$file ,$response) { +function versioncheck ($current, $new ,$file ,$response, $developer = false) { global $sql; $include = true; + if ($developer) { + $devVersion = $new; + } + if ($current < $new) { $response->add("Upgrading Database from $current to $new
"); @@ -193,7 +197,7 @@ try { $devVersion = '5.32'; - if (versioncheck($version, $devVersion, 'update_developer.php', $response)) { + if (versioncheck($version, $devVersion, 'update_developer.php', $response, true)) { $version = $devVersion; } } diff --git a/install/update_developer.php b/install/update_developer.php index a92c5c87..20cd8b39 100644 --- a/install/update_developer.php +++ b/install/update_developer.php @@ -37,8 +37,7 @@ * Programm erhalten haben. Wenn nicht, siehe . */ -if (isset($include) and $include == true) { - +if (isset($include) and $include == true and isset($devVersion)) { $query = $sql->prepare("SELECT `version` FROM `easywi_version` WHERE `version`=? LIMIT 1"); $query->execute(array($devVersion));