archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r16312 from branch 2.4 to trunk

Browse source 
bug 2677 fixed: smarter check of the database version and manage partial upgrade.



git-svn-id: http://piwigo.org/svn/trunk@16313 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2012-07-02 22:28:50 +00:00
commit 52fa0fed5e
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
install/upgrade_2.3.0.php
View file

@ -52,7 +52,7 @@ $to_apply = array_diff($existing, $applied);
$inserts = array();
foreach ($to_apply as $upgrade_id)
{
if ($upgrade_id >= 98)
if ($upgrade_id >= 112) // TODO change on each release
{
break;
}
@ -83,11 +83,18 @@ if (!empty($inserts))
ob_start();
echo '<pre>';
for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++)
for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++) // TODO change on each release
{
if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
{
break;
continue;
}
// maybe the upgrade task has already been applied in a previous and
// incomplete upgrade
if (in_array($upgrade_id, $applied))
{
continue;
}
unset($upgrade_description);