Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch #80963 by Dries et al: fixed race condition in _block_rehash(). 

Backport from HEAD.
5.x
Neil Drumm 2007-03-25 20:50:26 +00:00
parent 2f1edb4895
commit 9f33f00d35
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/block/block.module
View File

@ -148,6 +148,8 @@ function _block_rehash() {
init_theme(); init_theme();
db_lock_table('blocks');
$result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key); $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key);
while ($old_block = db_fetch_object($result)) { while ($old_block = db_fetch_object($result)) {
$old_blocks[$old_block->module][$old_block->delta] = $old_block; $old_blocks[$old_block->module][$old_block->delta] = $old_block;
@ -187,7 +189,6 @@ function _block_rehash() {
} }
} }
db_lock_table('blocks');
// Remove all blocks from table. // Remove all blocks from table.
db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key); db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key);