mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-25 19:00:03 +03:00
fixes #1544 upgrade script from 11 to 12
This commit is contained in:
parent
7417d974b0
commit
7f895d7c4a
3 changed files with 123 additions and 6 deletions
111
install/upgrade_11.0.0.php
Normal file
111
install/upgrade_11.0.0.php
Normal file
|
@ -0,0 +1,111 @@
|
|||
<?php
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | This file is part of Piwigo. |
|
||||
// | |
|
||||
// | For copyright and license information, please view the COPYING.txt |
|
||||
// | file that was distributed with this source code. |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
if (!defined('PHPWG_ROOT_PATH'))
|
||||
{
|
||||
die ('This page cannot be loaded directly, load upgrade.php');
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
|
||||
{
|
||||
die ('Hacking attempt!');
|
||||
}
|
||||
}
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Fill upgrade table without applying upgrade |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
// retrieve already applied upgrades
|
||||
$query = '
|
||||
SELECT id
|
||||
FROM '.PREFIX_TABLE.'upgrade
|
||||
;';
|
||||
$applied = query2array($query, null, 'id');
|
||||
|
||||
// retrieve existing upgrades
|
||||
$existing = get_available_upgrade_ids();
|
||||
|
||||
// which upgrades need to be applied?
|
||||
$to_apply = array_diff($existing, $applied);
|
||||
$inserts = array();
|
||||
foreach ($to_apply as $upgrade_id)
|
||||
{
|
||||
if ($upgrade_id >= 160) // TODO change on each release (first task to run)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
array_push(
|
||||
$inserts,
|
||||
array(
|
||||
'id' => $upgrade_id,
|
||||
'applied' => CURRENT_DATE,
|
||||
'description' => '[migration from 11.0.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if (!empty($inserts))
|
||||
{
|
||||
mass_inserts(
|
||||
'`'.UPGRADE_TABLE.'`',
|
||||
array_keys($inserts[0]),
|
||||
$inserts
|
||||
);
|
||||
}
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | Perform upgrades |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
ob_start();
|
||||
echo '<pre>';
|
||||
|
||||
for ($upgrade_id = 160; $upgrade_id <= 162; $upgrade_id++) // TODO change on each release
|
||||
{
|
||||
if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
|
||||
{
|
||||
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);
|
||||
|
||||
echo "\n\n";
|
||||
echo '=== upgrade '.$upgrade_id."\n";
|
||||
|
||||
// include & execute upgrade script. Each upgrade script must contain
|
||||
// $upgrade_description variable which describe briefly what the upgrade
|
||||
// script does.
|
||||
$up_start = get_moment();
|
||||
include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
|
||||
|
||||
// notify upgrade (TODO change on each release)
|
||||
$query = '
|
||||
INSERT INTO `'.PREFIX_TABLE.'upgrade`
|
||||
(id, applied, description)
|
||||
VALUES
|
||||
(\''.$upgrade_id.'\', NOW(), \'[migration from 11.0.0 to '.PHPWG_VERSION.', '.get_elapsed_time($up_start, get_moment()).'] '.$upgrade_description.'\')
|
||||
;';
|
||||
pwg_query($query);
|
||||
}
|
||||
|
||||
echo '</pre>';
|
||||
ob_end_clean();
|
||||
|
||||
// now we upgrade from 12.0.0
|
||||
// include_once(PHPWG_ROOT_PATH.'install/upgrade_12.0.0.php');
|
||||
?>
|
|
@ -107,5 +107,5 @@ echo '</pre>';
|
|||
ob_end_clean();
|
||||
|
||||
// now we upgrade from 11.0.0
|
||||
// include_once(PHPWG_ROOT_PATH.'install/upgrade_11.0.0.php');
|
||||
include_once(PHPWG_ROOT_PATH.'install/upgrade_11.0.0.php');
|
||||
?>
|
||||
|
|
16
upgrade.php
16
upgrade.php
|
@ -189,11 +189,6 @@ load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=
|
|||
load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
|
||||
load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
|
||||
load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
|
||||
// check php version
|
||||
if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
|
||||
{
|
||||
include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php');
|
||||
}
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | database connection |
|
||||
|
@ -353,6 +348,10 @@ SELECT id
|
|||
{
|
||||
$current_release = '2.10.0';
|
||||
}
|
||||
else if (!in_array(162, $applied_upgrades))
|
||||
{
|
||||
$current_release = '11.0.0';
|
||||
}
|
||||
else
|
||||
{
|
||||
// confirm that the database is in the same version as source code files
|
||||
|
@ -372,6 +371,13 @@ $page['infos'] = array();
|
|||
$page['errors'] = array();
|
||||
$mysql_changes = array();
|
||||
|
||||
// check php version
|
||||
if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
|
||||
{
|
||||
// include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php'); // to remove, with all its related content
|
||||
$page['errors'][] = l10n('PHP version %s required (you are running on PHP %s)', REQUIRED_PHP_VERSION, PHP_VERSION);
|
||||
}
|
||||
|
||||
check_upgrade_access_rights();
|
||||
|
||||
if ((isset($_POST['submit']) or isset($_GET['now']))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue