- Committed Marco's block rewrite:

   + Blocks are not longer called if not rendered: major performance
     improvement.
   + Fixed some bugs (preview option was broken, path option was broken).
   + Removed "ascii"-type blocks.
   + Added permission to for "PHP blocks"
   + ...

  NOTES:

   + You'll want to run "update.php":

       ALTER TABLE blocks DROP remove;
       ALTER TABLE blocks DROP name;

   + You'll want to update your custom modules as well as the modules in
     the contrib repository.  Block function should now read:

       function *_block($op = "list", $delta = 0) {
         if ($op == "list") {
           return array of block infos
         }
         else {
           return subject and content of $delta block
         }
       }

1 files changed, 0 insertions, 21 deletions

diff --git a/includes/module.inc b/includes/module.inc
index d908ceb25..7a248d236 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -69,25 +69,4 @@ function module_hook($name, $hook) {
   return function_exists($name ."_". $hook);
 }
 
-// rehash module-exported blocks:
-function module_rehash_blocks($name) {
-  db_query("UPDATE blocks SET remove = '1' WHERE module = '$name'");
-
-  if ($blocks = module_invoke($name, "block")) {
-    foreach ($blocks as $delta => $block) {
-      foreach ($block as $item => $data) {
-        $block[$item] = addslashes($data);
-      }
-      if (!db_fetch_object(db_query("SELECT * FROM blocks WHERE module = '$name' AND name = '$block[info]'"))) {
-        db_query("INSERT INTO blocks (name, module, delta) VALUES ('$block[info]', '$name', '$delta')");
-      }
-      else {
-        db_query("UPDATE blocks SET delta = '$delta', remove = '0' WHERE module = '$name' AND name = '$block[info]'");
-      }
-    }
-  }
-
-  db_query("DELETE FROM blocks WHERE module = '$name' AND remove = '1'");
-}
-
 ?>
\ No newline at end of file