*** common.inc	2007-01-10 18:30:08.000000000 -0500
--- common.new	2007-05-03 15:38:07.968750000 -0400
***************
*** 353,359 ****
      drupal_set_title(t('Page not found'));
    }
    // To conserve CPU and bandwidth, omit the blocks
!   print theme('page', $return, FALSE);
  }
  
  /**
--- 353,359 ----
      drupal_set_title(t('Page not found'));
    }
    // To conserve CPU and bandwidth, omit the blocks
!   print theme('page', $return, variable_get('site_404_full', FALSE));
  }
  
  /**
***************
*** 382,388 ****
      drupal_set_title(t('Access denied'));
      $return = t('You are not authorized to access this page.');
    }
!   print theme('page', $return);
  }
  
  /**
--- 382,388 ----
      drupal_set_title(t('Access denied'));
      $return = t('You are not authorized to access this page.');
    }
!   print theme('page', $return, variable_get('site_403_full', TRUE));
  }
  
  /**

*** system.module	2007-01-29 16:51:54.000000000 -0500
--- system.new	2007-05-03 15:19:31.703125000 -0400
***************
*** 621,626 ****
--- 621,633 ----
      '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
    );
  
+   $form['site_403_full'] = array(
+     '#type' => 'checkbox',
+     '#title' => t('Full 403 (access denied) page'),
+     '#default_value' => variable_get('site_403_full', TRUE),
+     '#description' => t('Display the 403 page with menus and blocks. If you don\'t use this, make sure your error page provides a means for the user to return to the site. Turning this off will save on CPU and bandwidth in the event of this error.'),
+   );
+ 
    $form['site_404'] = array(
      '#type' => 'textfield',
      '#title' => t('Default 404 (not found) page'),
***************
*** 630,635 ****
--- 637,649 ----
      '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
    );
  
+   $form['site_404_full'] = array(
+     '#type' => 'checkbox',
+     '#title' => t('Full 404 (not found) page'),
+     '#default_value' => variable_get('site_404_full', FALSE),
+     '#description' => t('Display the 404 page with menus and blocks. If you don\'t use this, make sure your error page provides a means for the user to return to the site. Turning this off will save on CPU and bandwidth in the event of this error.'),
+   );
+ 
    $form['error_level'] = array(
      '#type' => 'select', '#title' => t('Error reporting'), '#default_value' => variable_get('error_level', 1),
      '#options' => array(t('Write errors to the log'), t('Write errors to the log and to the screen')),