? .completion.db ? .git ? .patch ? block.patch ? drupal_render.patch ? drushrc.php ? tmp.patch ? tmp.patch.patch ? tmp.sql ? modules/menu/menu.js ? modules/node/node.diff.inc ? modules/node/node.js ? modules/node/node.pages-diff.inc ? modules/path/path.js ? modules/simpletest/tests/hook_url_rewrite.info ? modules/simpletest/tests/hook_url_rewrite.module ? modules/simpletest/tests/path.test ? modules/upload/upload.js Index: includes/cache.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/cache.inc,v retrieving revision 1.27 diff -u -F^f -p -r1.27 cache.inc --- includes/cache.inc 12 Oct 2008 04:30:05 -0000 1.27 +++ includes/cache.inc 1 Feb 2009 04:05:48 -0000 @@ -150,7 +150,9 @@ function cache_clear_all($cid = NULL, $t if (!isset($cid) && !isset($table)) { // Clear the block cache first, so stale data will // not end up in the page cache. - cache_clear_all(NULL, 'cache_block'); + if (module_exists('block')) { + cache_clear_all(NULL, 'cache_block'); + } cache_clear_all(NULL, 'cache_page'); return; } Index: modules/block/block.info =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.info,v retrieving revision 1.11 diff -u -F^f -p -r1.11 block.info --- modules/block/block.info 12 Oct 2008 01:23:02 -0000 1.11 +++ modules/block/block.info 1 Feb 2009 04:05:49 -0000 @@ -8,4 +8,3 @@ core = 7.x files[] = block.module files[] = block.admin.inc files[] = block.install -required = TRUE Index: modules/block/block.install =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.install,v retrieving revision 1.17 diff -u -F^f -p -r1.17 block.install --- modules/block/block.install 16 Dec 2008 23:57:31 -0000 1.17 +++ modules/block/block.install 1 Feb 2009 04:05:49 -0000 @@ -169,6 +169,20 @@ function block_schema() { } /** + * Implementation of hook_install(). + */ +function block_install() { + drupal_install_schema('block'); +} + +/** + * Implementation of hook_uninstall(). + */ +function block_uninstall() { + drupal_uninstall_schema('block'); +} + +/** * Refresh the block cache. */ function block_update_7000() { Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.320 diff -u -F^f -p -r1.320 block.module --- modules/block/block.module 27 Jan 2009 00:22:25 -0000 1.320 +++ modules/block/block.module 1 Feb 2009 04:05:49 -0000 @@ -624,3 +624,10 @@ function _block_get_cache_id($block) { return implode(':', $cid_parts); } } + +/** + * Implementation of hook_flush_caches(). + */ +function block_flush_caches() { + return array('cache_block'); +} Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.305 diff -u -F^f -p -r1.305 system.install --- modules/system/system.install 31 Jan 2009 16:50:57 -0000 1.305 +++ modules/system/system.install 1 Feb 2009 04:05:50 -0000 @@ -330,7 +330,7 @@ function system_install() { } // Create tables. - $modules = array('system', 'filter', 'block', 'user', 'node'); + $modules = array('system', 'filter', 'user', 'node'); foreach ($modules as $module) { drupal_install_schema($module); } @@ -369,9 +369,6 @@ function system_install() { db_query("INSERT INTO {variable} (name, value) VALUES ('%s', '%s')", 'theme_default', 's:7:"garland";'); db_query("UPDATE {system} SET status = %d WHERE type = '%s' AND name = '%s'", 1, 'theme', 'garland'); - db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'login', 'garland', 1, 0, 'left', '', -1); - db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'navigation', 'garland', 1, 0, 'left', '', -1); - db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'powered-by', 'garland', 1, 10, 'footer', '', -1); db_query("INSERT INTO {node_access} (nid, gid, realm, grant_view, grant_update, grant_delete) VALUES (%d, %d, '%s', %d, %d, %d)", 0, 0, 'all', 1, 0, 0); Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.663 diff -u -F^f -p -r1.663 system.module --- modules/system/system.module 31 Jan 2009 15:55:05 -0000 1.663 +++ modules/system/system.module 1 Feb 2009 04:05:50 -0000 @@ -1547,7 +1547,7 @@ function system_cron() { } } - $core = array('cache', 'cache_block', 'cache_filter', 'cache_page', 'cache_form', 'cache_menu'); + $core = array('cache', 'cache_filter', 'cache_page', 'cache_form', 'cache_menu'); $cache_tables = array_merge(module_invoke_all('flush_caches'), $core); foreach ($cache_tables as $table) { cache_clear_all(NULL, $table); Index: profiles/default/default.profile =================================================================== RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v retrieving revision 1.36 diff -u -F^f -p -r1.36 default.profile --- profiles/default/default.profile 14 Jan 2009 21:16:21 -0000 1.36 +++ profiles/default/default.profile 1 Feb 2009 04:05:51 -0000 @@ -8,7 +8,7 @@ * An array of modules to enable. */ function default_profile_modules() { - return array('color', 'comment', 'help', 'menu', 'taxonomy', 'dblog'); + return array('block', 'color', 'comment', 'help', 'menu', 'taxonomy', 'dblog'); } /** @@ -90,6 +90,11 @@ function default_profile_task_list() { * modify the $task, otherwise discarded. */ function default_profile_tasks(&$task, $url) { + + // Enable 3 standard blocks. + db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'login', 'garland', 1, 0, 'left', '', -1); + db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'navigation', 'garland', 1, 0, 'left', '', -1); + db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'powered-by', 'garland', 1, 10, 'footer', '', -1); // Insert default user-defined node types into the database. For a complete // list of available node type attributes, refer to the node type API