diff -r 380e55865f86 -r 42c6c83b8a00 upgrade.php --- a/upgrade.php Mon Sep 24 21:29:19 2007 -0400 +++ b/upgrade.php Sun Sep 30 19:16:24 2007 -0400 @@ -61,7 +61,7 @@ // Everything related to versions goes here! // Valid versions to upgrade from -$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1'); +$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1'); // Basically a list of dependencies, which should be resolved automatically // If, for example, upgrading from 1.0b1 to 1.0RC1 requires one extra query that would not @@ -75,7 +75,8 @@ '1.0RC2' => Array('1.0RC3'), '1.0RC3' => Array('1.0'), '1.0' => Array('1.0.1'), - '1.0.1' => Array('1.0.1.1') + '1.0.1' => Array('1.0.1.1'), + '1.0.1.1' => Array('1.0.2b1') ); $this_version = '1.0.2'; $func_list = Array( @@ -619,10 +620,10 @@ $schema = file_get_contents('upgrade.sql'); // Strip out and process version blocks - preg_match_all('#---BEGIN ([0-9A-z\.\-]*?)---'."\n".'(.*?)'."\n".'---END \\1---#is', $schema, $matches); + preg_match_all('#---BEGIN ([0-9A-z\.\-]*?)---'."\n".'((.*?)'."\n)?".'---END \\1---#is', $schema, $matches); $from_list =& $matches[1]; - $query_list =& $matches[2]; + $query_list =& $matches[3]; foreach($matches[0] as $m) {