From 104b93e80d5785fffd655171f06f23f54d68ab04 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 2 Jan 2014 15:04:16 +0000
Subject: feature 3016: upgrade script to Piwigo 2.6

git-svn-id: http://piwigo.org/svn/trunk@26401 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 upgrade.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'upgrade.php')

diff --git a/upgrade.php b/upgrade.php
index 06014b3fc..36fbd7fbc 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -335,6 +335,10 @@ else if (!in_array('rotation', $columns_of[PREFIX_TABLE.'images']))
 {
   $current_release = '2.3.0';
 }
+else if (!in_array('website_url', $columns_of[PREFIX_TABLE.'comments']))
+{
+  $current_release = '2.4.0';
+}
 else
 {
   // retrieve already applied upgrades
@@ -344,15 +348,16 @@ SELECT id
 ;';
   $applied_upgrades = array_from_query($query, 'id');
 
-  if (!in_array(134, $applied_upgrades))
+  if (!in_array(139, $applied_upgrades))
   {
-    $current_release = '2.4.0';
+    $current_release = '2.5.0';
   }
   else
   {
     // confirm that the database is in the same version as source code files
     conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
-    
+
+    header('Content-Type: text/html; charset='.get_pwg_charset());
     echo 'No upgrade required, the database structure is up to date';
     echo '<br><a href="index.php">← back to gallery</a>';
     exit();
-- 
cgit v1.2.3