- Patch #221399 by smk-ka, jeffschuler, lilou, earnie et al: make it possible to enable blocks on 404 pages.

1 files changed, 8 insertions, 2 deletions

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index ba0024574..5425ae15f 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1224,7 +1224,7 @@ function system_site_information_settings() {
     '#title' => t('Default 403 (access denied) page'),
     '#default_value' => '',
     '#size' => 40,
-    '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'),
+    '#description' => t('This page is displayed when the requested document is denied to the current user. Leave blank to display a generic "access denied" page.'),
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
   $form['site_404'] = array(
@@ -1232,9 +1232,15 @@ function system_site_information_settings() {
     '#title' => t('Default 404 (not found) page'),
     '#default_value' => '',
     '#size' => 40,
-    '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'),
+    '#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['#validate'][] = 'system_site_information_settings_validate';
 
   return system_settings_form($form);