3 files changed, 0 insertions, 26 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 3b115c872..0f98ef355 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1308,12 +1308,6 @@ function system_site_information_settings() {
     '#description' => t('This page is displayed when no other content matches the requested document. Leave blank to display a generic "page not found" page.'),
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
-  $form['site_404_blocks'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Display blocks on default 404 (not found) page'),
-    '#description' => t('Render all blocks on the default 404 (not found) page. Disabling blocks can help with performance but might leave users with a less functional site.'),
-    '#default_value' => variable_get('site_404_blocks', 0)
-  );
   $form['cron_safe_threshold'] = array(
     '#type' => 'select',
     '#title' => t('Automatically run cron'),
@@ -1941,7 +1935,6 @@ function system_batch_page() {
     // display a list of collected messages later.
     drupal_set_page_content($output);
     $page = element_info('page');
-    $page['#show_blocks'] = FALSE;
     $page['#show_messages'] = FALSE;
     return $page;
   }
diff --git a/modules/system/system.module b/modules/system/system.module
index e7342e699..502f22b3e 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -291,7 +291,6 @@ function system_elements() {
 
   $type['page'] = array(
     '#show_messages' => TRUE,
-    '#show_blocks' => TRUE,
     '#theme' => 'page',
   );
 
diff --git a/modules/system/system.test b/modules/system/system.test
index b5176fd85..ae77dc0dd 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -626,24 +626,6 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
 
     $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.
-    $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('site_404' => ''), t('Save configuration'));
-
-    // 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'));
   }
 }