Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/Attic/block.module,v
retrieving revision 1.206.2.3
diff -u -F^f -r1.206.2.3 block.module
--- modules/block.module	20 Aug 2006 11:32:00 -0000	1.206.2.3
+++ modules/block.module	27 Aug 2006 16:28:53 -0000
@@ -142,16 +142,16 @@ function block_block($op = 'list', $delt
  */
 function _block_rehash() {
   global $theme_key;
+  $blocks = array();
 
   init_theme();
 
   $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;
+  while ($block = db_fetch_array($result)) {
+    $blocks[$block['module'] .'-'. $block['delta']] = $block;
+    $blocks[$block['module'] .'-'. $block['delta']]['in_database'] = TRUE;
   }
 
-  $blocks = array();
-
   foreach (module_list() as $module) {
     $module_blocks = module_invoke($module, 'block', 'list');
     if ($module_blocks) {
@@ -159,39 +159,36 @@ function _block_rehash() {
         $block['module'] = $module;
         $block['delta']  = $delta;
         // If previously written to database, load values.
-        if ($old_blocks[$module][$delta]) {
-          $block['status'] = $old_blocks[$module][$delta]->status;
-          $block['weight'] = $old_blocks[$module][$delta]->weight;
-          $block['region'] = $old_blocks[$module][$delta]->region;
-          $block['visibility'] = $old_blocks[$module][$delta]->visibility;
-          $block['pages'] = $old_blocks[$module][$delta]->pages;
-          $block['custom'] = $old_blocks[$module][$delta]->custom;
-          $block['throttle'] = $old_blocks[$module][$delta]->throttle;
+        if ($blocks[$module .'-'. $delta]) {
+          foreach ($block as $key => $value) {
+            if (!isset($blocks[$module .'-'. $delta][$key])) {
+              $blocks[$module .'-'. $delta][$key] = $block[$key];
+            }
+          }
+          unset($blocks[$module .'-'. $delta]['in_database']);
         }
         // Otherwise, use any set values, or else substitute defaults.
         else {
-          $properties = array('status' => 0, 'weight' => 0, 'region' => 'left', 'pages' => '', 'custom' => 0);
+          $properties = array('status' => 0, 'weight' => 0, 'region' => 'left', 'pages' => '', 'custom' => 0, 'in_database' => FALSE);
           foreach ($properties as $property => $default) {
             if (!isset($block[$property])) {
               $block[$property] = $default;
             }
           }
+          $blocks[$module .'-'. $delta] = $block;
         }
-
-        $blocks[] = $block;
       }
     }
   }
 
-  db_lock_table('blocks');
-  // Remove all blocks from table.
-  db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key);
-  
-  // Reinsert new set of blocks into table.
   foreach ($blocks as $block) {
-    db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', '%s', %d, %d, '%s', %d, '%s', %d, %d)", $block['module'], $block['delta'], $theme_key, $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']);
+    if ($block['in_database'] === TRUE) {
+      db_queryd("DELETE FROM {blocks} WHERE theme = '%s' AND module = '%s' AND delta = '%s'", $theme_key, $block['module'], $block['delta']);
+    }
+    elseif ($block['in_database'] === FALSE) {
+      db_queryd("INSERT INTO {blocks} (module, delta, theme, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', '%s', %d, %d, '%s', %d, '%s', %d, %d)", $block['module'], $block['delta'], $theme_key, $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']);
+    }
   }
-  db_unlock_tables();
 
   return $blocks;
 }