? .DS_Store
? 404_regions_00.patch
? make_node_optional_11.patch
? remove_node_frontpage_03.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.874
diff -u -p -r1.874 common.inc
--- includes/common.inc	30 Mar 2009 05:13:45 -0000	1.874
+++ includes/common.inc	1 Apr 2009 20:38:38 -0000
@@ -353,7 +353,7 @@ function drupal_goto($path = '', $query 
 }
 
 /**
- * Generates a site offline message.
+ * Generate a site offline message.
  */
 function drupal_site_offline() {
   drupal_maintenance_theme();
@@ -364,11 +364,10 @@ function drupal_site_offline() {
 }
 
 /**
- * Generates a 404 error if the request can not be handled.
+ * Generate a 404 error if the request can not be handled.
  */
 function drupal_not_found() {
   drupal_set_header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
-
   watchdog('page not found', check_plain($_GET['q']), NULL, WATCHDOG_WARNING);
 
   // Keep old path for reference.
@@ -390,15 +389,11 @@ function drupal_not_found() {
     $return = t('The requested page could not be found.');
   }
 
-  $page = drupal_get_page($return);
-  // To conserve CPU and bandwidth, omit the blocks.
-  $page['#show_blocks'] = FALSE;
-
-  print drupal_render_page($page);
+  print drupal_render_page($return);
 }
 
 /**
- * Generates a 403 error if the request is not allowed.
+ * Generate a 403 error if the request is not allowed.
  */
 function drupal_access_denied() {
   drupal_set_header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.40
diff -u -p -r1.40 system.test
--- modules/system/system.test	31 Mar 2009 01:49:54 -0000	1.40
+++ modules/system/system.test	1 Apr 2009 20:38:38 -0000
@@ -501,6 +501,7 @@ class PageNotFoundTestCase extends Drupa
   }
 
   function testPageNotFound() {
+    // Check that the default 404 page can be found.
     $this->drupalGet($this->randomName(10));
     $this->assertText(t('Page not found'), t('Found the default 404 page'));
 
@@ -516,23 +517,11 @@ class PageNotFoundTestCase extends Drupa
     $this->drupalGet($this->randomName(10));
     $this->assertText($node->title, t('Found the custom 404 page'));
 
-    // Logout and check that the user login block is not shown on custom 404 pages.
+    // Logout and check that the custom 404 page can be found.
     $this->drupalLogout();
 
     $this->drupalGet($this->randomName(10));
     $this->assertText($node->title, t('Found the custom 404 page'));
-    $this->assertNoText(t('User login'), t('Blocks are not shown on the custom 404 page'));
-
-    // Log back in and remove the custom 404 page.
-    $this->drupalLogin($this->admin_user);
-    $this->drupalPost('admin/settings/site-information', array(), t('Reset to defaults'));
-
-    // Logout and check that the user login block is not shown on default 404 pages.
-    $this->drupalLogout();
-
-    $this->drupalGet($this->randomName(10));
-    $this->assertText(t('Page not found'), t('Found the default 404 page'));
-    $this->assertNoText(t('User login'), t('Blocks are not shown on the default 404 page'));
   }
 }