From 35550fd6270c19978ee6b64aa201a7156dde34b6 Mon Sep 17 00:00:00 2001 From: tjhunt Date: Thu, 7 May 2009 03:02:06 +0000 Subject: [PATCH] blocklib: MDL-19010 re-fix another Nico 'fix' ;-) --- lib/db/upgrade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index edb646a1012ca..fe37403fbf73c 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -1751,7 +1751,7 @@ function xmldb_main_upgrade($oldversion) { $table->add_field('blockid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0'); $table->add_field('pageid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0'); $table->add_field('pagetype', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, null, null); - $table->add_field('region', XMLDB_TYPE_CHAR, '10', null, XMLDB_NOTNULL, null, null, null, null); + $table->add_field('position', XMLDB_TYPE_CHAR, '10', null, XMLDB_NOTNULL, null, null, null, null); $table->add_field('weight', XMLDB_TYPE_INTEGER, '3', null, XMLDB_NOTNULL, null, null, null, '0'); $table->add_field('visible', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, null, null, '0'); $table->add_field('configdata', XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null); @@ -1775,8 +1775,8 @@ function xmldb_main_upgrade($oldversion) { if ($result && $oldversion < 2009050604) { /// Copy current blocks data from block_instances to block_instance_old - $DB->execute('INSERT INTO {block_instance_old} (oldid, blockid, pageid, pagetype, weight, visible, configdata) - SELECT id, blockid, pageid, pagetype, weight, visible, configdata FROM {block_instances} ORDER BY id'); + $DB->execute('INSERT INTO {block_instance_old} (oldid, blockid, pageid, pagetype, position, weight, visible, configdata) + SELECT id, blockid, pageid, pagetype, position, weight, visible, configdata FROM {block_instances} ORDER BY id'); upgrade_main_savepoint($result, 2009050604); }