Commit ba15b28e authored by Dries's avatar Dries
Browse files

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

parent 757ac966
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment