Merge branch 'master' into translation

1 files changed, 8 insertions, 3 deletions

diff --git a/upgrade.php b/upgrade.php
index e67d8fa0f..11b745b6d 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
   {
@@ -476,7 +480,8 @@ REPLACE INTO '.PLUGINS_TABLE.'
         
         $template->assign(
           array(
-            'button_label' => l10n('2_7_0_descrp'), // TODO avoid to update it on each release
+            // TODO find a better way to do that, with a core string in English
+            'button_label' => str_replace('2.7', get_branch_from_version(PHPWG_VERSION), l10n('2_7_0_descrp')),
             'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&pwg_token='.get_pwg_token(),
             )
           );