From ba15b28ece619b1ac80835a4b2c0208278071c45 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 25 Mar 2007 20:00:05 +0000
Subject: [PATCH] - Patch #80963 by Dries et al: fixed race condition in
_block_rehash().
---
modules/block/block.module | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/block/block.module b/modules/block/block.module
index d0311a206e09..1236d1332b9f 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -146,6 +146,8 @@ function _block_rehash() {
init_theme();
+ db_lock_table('blocks');
+
$result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key);
while ($old_block = db_fetch_object($result)) {
$old_blocks[$old_block->module][$old_block->delta] = $old_block;
@@ -185,7 +187,6 @@ function _block_rehash() {
}
}
- db_lock_table('blocks');
// Remove all blocks from table.
db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key);
--
GitLab