diff --git a/install/upgrade_2.1.0.php b/install/upgrade_2.1.0.php index 2d827cdb6..c4e8eb4c5 100644 --- a/install/upgrade_2.1.0.php +++ b/install/upgrade_2.1.0.php @@ -114,5 +114,5 @@ echo ''; ob_end_clean(); // now we upgrade from 2.2.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.2.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_2.2.0.php'); ?> diff --git a/install/upgrade_2.2.0.php b/install/upgrade_2.2.0.php new file mode 100644 index 000000000..7944d2232 --- /dev/null +++ b/install/upgrade_2.2.0.php @@ -0,0 +1,118 @@ += 98) + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 2.2.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 = 98; $upgrade_id <= 111; $upgrade_id++)
+{
+ if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
+ {
+ break;
+ }
+
+ 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.2.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
+;';
+ pwg_query($query);
+}
+
+echo '';
+ob_end_clean();
+
+// now we upgrade from 2.2.0
+// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.2.0.php');
+?>
diff --git a/upgrade.php b/upgrade.php
index 8257ba3fb..43cf70b7a 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -288,6 +288,10 @@ else if (!in_array('added_by', $columns_of[PREFIX_TABLE.'images']))
{
$current_release = '2.1.0';
}
+else if (!in_array('rating_score', $columns_of[PREFIX_TABLE.'images']))
+{
+ $current_release = '2.2.0';
+}
else
{
die('No upgrade required, the database structure is up to date');