/[drupal]/drupal/modules/block.module
ViewVC logotype

Diff of /drupal/modules/block.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.206.2.2, Sun Jul 2 20:53:52 2006 UTC revision 1.206.2.3, Sun Aug 20 11:32:00 2006 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: block.module,v 1.206.2.1 2006/05/21 13:49:07 killes Exp $  // $Id: block.module,v 1.206.2.2 2006/07/02 20:53:52 killes Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 150  function _block_rehash() { Line 150  function _block_rehash() {
150      $old_blocks[$old_block->module][$old_block->delta] = $old_block;      $old_blocks[$old_block->module][$old_block->delta] = $old_block;
151    }    }
152    
153    db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key);    $blocks = array();
154    
155    foreach (module_list() as $module) {    foreach (module_list() as $module) {
156      $module_blocks = module_invoke($module, 'block', 'list');      $module_blocks = module_invoke($module, 'block', 'list');
# Line 178  function _block_rehash() { Line 178  function _block_rehash() {
178            }            }
179          }          }
180    
         // Reinsert blocks into table  
         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']);  
181          $blocks[] = $block;          $blocks[] = $block;
182        }        }
183      }      }
184    }    }
185    
186      db_lock_table('blocks');
187      // Remove all blocks from table.
188      db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key);
189    
190      // Reinsert new set of blocks into table.
191      foreach ($blocks as $block) {
192        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']);
193      }
194      db_unlock_tables();
195    
196    return $blocks;    return $blocks;
197  }  }
198    
Legend:
Removed from v.1.206.2.2  
changed lines
  Added in v.1.206.2.3
  ViewVC Help
Powered by ViewVC 1.1.2