Commit 0ddfd29c authored by Dries's avatar Dries
Browse files

- Patch #44286 by Neil, Zen, et al: a couple fixes to the upgrade path.

parent ae84e469
......@@ -481,7 +481,7 @@ function system_update_132() {
*/
$ret = array();
if (variable_get('update_132_done', FALSE)) {
if (!variable_get('update_132_done', FALSE)) {
if ($GLOBALS['db_type'] == 'pgsql') {
$ret[] = update_sql('DROP TABLE {search_total}');
$ret[] = update_sql("CREATE TABLE {search_total} (
......@@ -530,7 +530,7 @@ function system_update_134() {
}
function system_update_135() {
if (variable_get('update_135_done', FALSE)) {
if (!variable_get('update_135_done', FALSE)) {
$result = db_query("SELECT delta FROM {blocks} WHERE module = 'aggregator'");
while ($block = db_fetch_object($result)) {
list($type, $id) = explode(':', $block->delta);
......@@ -565,7 +565,7 @@ function system_update_136() {
function system_update_137() {
$ret = array();
if (variable_get('update_137_done', FALSE)) {
if (!variable_get('update_137_done', FALSE)) {
if ($GLOBALS['db_type'] == 'mysql') {
$ret[] = update_sql("ALTER TABLE {locales_source} CHANGE location location varchar(255) NOT NULL default ''");
}
......
......@@ -161,7 +161,7 @@ function update_fix_schema_version() {
'2005-01-28' => 123, '2005-02-11' => 124, '2005-02-23' => 125,
'2005-03-03' => 126, '2005-03-18' => 127, '2005-03-21' => 128,
// The following three updates were made on the 4.6 branch
'2005-04-14' => 129, '2005-05-06' => 129, '2005-05-07' => 129,
'2005-04-14' => 128, '2005-05-06' => 128, '2005-05-07' => 128,
'2005-04-08: first update since Drupal 4.6.0 release' => 129,
'2005-04-10' => 130, '2005-04-11' => 131, '2005-04-14' => 132,
'2005-04-24' => 133, '2005-04-30' => 134, '2005-05-06' => 135,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment