diff --git a/install/upgrade_2.3.0.php b/install/upgrade_2.3.0.php index 7b38b24c3..7e8946b37 100644 --- a/install/upgrade_2.3.0.php +++ b/install/upgrade_2.3.0.php @@ -121,5 +121,5 @@ echo ''; ob_end_clean(); // now we upgrade from 2.4.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.4.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_2.4.0.php'); ?> diff --git a/install/upgrade_2.4.0.php b/install/upgrade_2.4.0.php new file mode 100644 index 000000000..20f5d9c29 --- /dev/null +++ b/install/upgrade_2.4.0.php @@ -0,0 +1,125 @@ += 128) // TODO change on each release + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 2.4.0 to '.PHPWG_VERSION.'] not applied', + ) + ); +} + +if (!empty($inserts)) +{ + mass_inserts( + '`'.UPGRADE_TABLE.'`', + array_keys($inserts[0]), + $inserts + ); +} + +// +-----------------------------------------------------------------------+ +// | Perform upgrades | +// +-----------------------------------------------------------------------+ + +ob_start(); +echo '
'; + +for ($upgrade_id = 128; $upgrade_id <= 134; $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. + include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'); + + // notify upgrade + $query = ' +INSERT INTO `'.PREFIX_TABLE.'upgrade` + (id, applied, description) + VALUES + (\''.$upgrade_id.'\', NOW(), \'[migration from 2.4.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\') +;'; + pwg_query($query); +} + +echo ''; +ob_end_clean(); + +// now we upgrade from 2.5.0 +// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.5.0.php'); +?> diff --git a/upgrade.php b/upgrade.php index 4a40b54f0..ca1ba500d 100644 --- a/upgrade.php +++ b/upgrade.php @@ -322,6 +322,10 @@ else if (!in_array('rating_score', $columns_of[PREFIX_TABLE.'images'])) { $current_release = '2.2.0'; } +else if (!in_array('rotation', $columns_of[PREFIX_TABLE.'images'])) +{ + $current_release = '2.3.0'; +} else { // retrieve already applied upgrades @@ -331,9 +335,9 @@ SELECT id ;'; $applied_upgrades = array_from_query($query, 'id'); - if (!in_array(127, $applied_upgrades)) + if (!in_array(134, $applied_upgrades)) { - $current_release = '2.3.0'; + $current_release = '2.4.0'; } else {