diff options
author | plegall <plg@piwigo.org> | 2006-11-09 22:13:33 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2006-11-09 22:13:33 +0000 |
commit | 1233f248ed20795c544441c5ebd97e344462c70a (patch) | |
tree | 3e0594904d0bf4dedfad9cfccd3391698897b478 /upgrade.php | |
parent | e4606c00b04bb58e18fdf744567d1d329658719d (diff) |
New: upgrade script from 1.6.0 (or 1.6.1) to 1.6.2.
#user_infos.auto_login_key is added in upgrade_1.6.0.php instead of
upgrade_1.5.0.php.
Bug fixed: the database structure dump was starting with a "1", very
interesting typo!
Bug fixed: the database structure dump was adding #user_infos.auto_login_key
nullable while the upgrade file was adding it not nullable.
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1599 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'upgrade.php')
-rw-r--r-- | upgrade.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/upgrade.php b/upgrade.php index c2a68a920..636945cbd 100644 --- a/upgrade.php +++ b/upgrade.php @@ -181,9 +181,13 @@ if (!isset($_GET['version'])) { $current_release = '1.5.0'; } + else if (!in_array('auto_login_key', $columns_of[PREFIX_TABLE.'user_infos'])) + { + $current_release = '1.6.0'; + } else { - die('You are already on branch 1.6, no upgrade required'); + die('No upgrade required, the database structure is up to date'); } $template->assign_block_vars( @@ -223,7 +227,7 @@ else array( 'id' => $upgrade_id, 'applied' => CURRENT_DATE, - 'description' => 'upgrade included in upgrade', + 'description' => 'upgrade included in migration', ) ); } |