summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-11-14 09:31:05 +0000
committerDries Buytaert <dries@buytaert.net>2007-11-14 09:31:05 +0000
commit44373cf0b16a181b5dd380b1f6e6aae1e2d118d5 (patch)
treecf58c744d99b86c33195d2a288fc7b0f48216626 /modules
parente05c6195ab1ee662807ffa71d533c7680fbd58d6 (diff)
downloadbrdo-44373cf0b16a181b5dd380b1f6e6aae1e2d118d5.tar.gz
brdo-44373cf0b16a181b5dd380b1f6e6aae1e2d118d5.tar.bz2
- Patch #191282 by quicksketch: inconsistent database region for disabled blocks.
Diffstat (limited to 'modules')
-rw-r--r--modules/block/block.install2
-rw-r--r--modules/system/system.install9
2 files changed, 10 insertions, 1 deletions
diff --git a/modules/block/block.install b/modules/block/block.install
index 26404dd0b..e4fc5e6dc 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -52,7 +52,7 @@ function block_schema() {
'type' => 'varchar',
'length' => 64,
'not null' => TRUE,
- 'default' => 'left',
+ 'default' => '',
'description' => t('Theme region within which the block is set.'),
),
'custom' => array(
diff --git a/modules/system/system.install b/modules/system/system.install
index a38fde80f..ba3438b08 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -4525,6 +4525,15 @@ function system_update_6036() {
}
/**
+ * Create consistent empty region for disabled blocks.
+ */
+function system_update_6037() {
+ $ret = array();
+ $ret[] = update_sql("UPDATE {blocks} SET region = '' WHERE status = 0");
+ return $ret;
+}
+
+/**
* @} End of "defgroup updates-5.x-to-6.x"
* The next series of updates should start at 7000.
*/