aboutsummaryrefslogtreecommitdiffstats
path: root/upgrade.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2016-02-23 12:18:58 +0100
committerplegall <plg@piwigo.org>2016-02-23 12:18:58 +0100
commit01d923bcb0bf0dfd6b51e15fcfb6975b69d6ab0a (patch)
tree17ff98ad7583bcabc900fd85e11e58eb07aed4e7 /upgrade.php
parent8ffed400035ccb8c6bbd9f3a75e3d995a6824712 (diff)
parent90be0782ff880178e6b4f39c3f1e63494d3ff279 (diff)
Merge branch 'feature/423-upgrade-2.8'
Diffstat (limited to 'upgrade.php')
-rw-r--r--upgrade.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/upgrade.php b/upgrade.php
index e67d8fa0f..6c56d383f 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -342,6 +342,10 @@ else if (!in_array('nb_available_tags', $columns_of[PREFIX_TABLE.'user_cache']))
{
$current_release = '2.5.0';
}
+else if (!in_array('activation_key_expire', $columns_of[PREFIX_TABLE.'user_infos']))
+{
+ $current_release = '2.6.0';
+}
else
{
// retrieve already applied upgrades
@@ -351,9 +355,9 @@ SELECT id
;';
$applied_upgrades = array_from_query($query, 'id');
- if (!in_array(144, $applied_upgrades))
+ if (!in_array(148, $applied_upgrades))
{
- $current_release = '2.6.0';
+ $current_release = '2.7.0';
}
else
{