- Patch #16216 by nedjo: multiple block regions!

3 files changed, 32 insertions, 7 deletions

diff --git a/database/database.mysql b/database/database.mysql
index 6db6c4fb0..bdd3d5346 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -121,9 +121,10 @@ CREATE TABLE authmap (
 CREATE TABLE blocks (
   module varchar(64) DEFAULT '' NOT NULL,
   delta varchar(32) NOT NULL default '0',
+  theme varchar(255) NOT NULL default '',
   status tinyint(2) DEFAULT '0' NOT NULL,
   weight tinyint(1) DEFAULT '0' NOT NULL,
-  region tinyint(1) DEFAULT '0' NOT NULL,
+  region varchar(64) DEFAULT 'left' NOT NULL,
   custom tinyint(2) DEFAULT '0' NOT NULL,
   throttle tinyint(1) DEFAULT '0' NOT NULL,
   visibility tinyint(1) DEFAULT '0' NOT NULL,
@@ -805,8 +806,8 @@ REPLACE variable SET name='update_start', value='s:10:"2005-03-21";';
 
 REPLACE variable SET name='theme_default', value='s:10:"bluemarine";';
 
-REPLACE blocks SET module = 'user', delta = '0', status = '1';
-REPLACE blocks SET module = 'user', delta = '1', status = '1';
+REPLACE blocks SET module = 'user', delta = '0', theme = 'bluemarine', status = '1';
+REPLACE blocks SET module = 'user', delta = '1', theme = 'bluemarine', status = '1';
 
 INSERT INTO sequences (name, id) VALUES ('menu_mid', 1);
 
diff --git a/database/database.pgsql b/database/database.pgsql
index 166dfa8f6..6dfb853ba 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -116,9 +116,10 @@ CREATE TABLE authmap (
 CREATE TABLE blocks (
   module varchar(64) NOT NULL default '',
   delta varchar(32) NOT NULL default '0',
+  theme varchar(255) NOT NULL default '',
   status smallint NOT NULL default '0',
   weight smallint NOT NULL default '0',
-  region smallint NOT NULL default '0',
+  region varchar(64) DEFAULT 'left' NOT NULL,
   custom smallint NOT NULL default '0',
   throttle smallint NOT NULL default '0',
   visibility smallint NOT NULL default '0',
@@ -798,8 +799,8 @@ INSERT INTO permission VALUES (1,'access content',0);
 INSERT INTO role (name) VALUES ('authenticated user');
 INSERT INTO permission VALUES (2,'access comments, access content, post comments, post comments without approval',0);
 
-INSERT INTO blocks(module,delta,status) VALUES('user', 0, 1);
-INSERT INTO blocks(module,delta,status) VALUES('user', 1, 1);
+INSERT INTO blocks(module,delta,theme,status) VALUES('user', 0, 'bluemarine', 1);
+INSERT INTO blocks(module,delta,theme,status) VALUES('user', 1, 'bluemarine', 1);
 
 INSERT INTO node_access VALUES (0, 0, 'all', 1, 0, 0);
 
diff --git a/database/updates.inc b/database/updates.inc
index 435af3373..e57ed1742 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -120,7 +120,8 @@ $sql_updates = array(
   "2005-05-22" => "update_141",
   "2005-07-29" => "update_142",
   "2005-07-30" => "update_143",
-  "2005-08-08" => "update_144"
+  "2005-08-08" => "update_144",
+  "2005-08-15" => "update_145"
 );
 
 function update_32() {
@@ -2550,6 +2551,28 @@ function update_144() {
   return $ret;
 }
 
+function update_145() {
+  $default_theme = variable_get('theme_default', 'bluemarine');
+  $ret = array();
+  $ret[] = update_sql("ALTER TABLE {blocks} CHANGE region region varchar(64) default 'left' NOT NULL");
+  $ret[] = update_sql("ALTER TABLE {blocks} ADD theme varchar(255) NOT NULL default ''");
+
+  // Intialize block data for default theme
+  $ret[] = update_sql("UPDATE {blocks} SET region = 'left' WHERE region = '0'");
+  $ret[] = update_sql("UPDATE {blocks} SET region = 'right' WHERE region = '1'");
+  db_query("UPDATE {blocks} SET theme = '%s'", $default_theme);
+
+  // Initialze block data for other enabled themes.
+  $themes = list_themes();
+  foreach (array_keys($themes) as $theme) {
+    if (($theme != $default_theme) && $themes[$theme]->status == 1) {
+      system_initialize_theme_blocks($theme);
+    }
+  }
+
+  return $ret;
+}
+
 function update_sql($sql) {
   $edit = $_POST["edit"];
   $result = db_query($sql);