diff options
| author | David Rothstein <drothstein@gmail.com> | 2012-11-04 23:30:05 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2012-11-04 23:30:05 -0500 |
| commit | 8a4df80203b3536efbf2097a8ddf31dd62c77451 (patch) | |
| tree | 6204af3a67ac5efd8c5e1d54219dbeb863505fda | |
| parent | ff1d0fccf766764d0fa925f2ac9336c5543bb31d (diff) | |
| download | brdo-8a4df80203b3536efbf2097a8ddf31dd62c77451.tar.gz brdo-8a4df80203b3536efbf2097a8ddf31dd62c77451.tar.bz2 | |
Issue #1436814 by gary4gar, kid_icarus, netol, webchick, droplet, andypost: Fixed Fast 404 'Not found' pages are missing a doctype.
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | includes/bootstrap.inc | 2 | ||||
| -rw-r--r-- | sites/default/default.settings.php | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 17e4024d7..d038dbcd8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,8 @@ Drupal 7.17, xxxx-xx-xx (development version) ----------------------- +- Changed the default value of the '404_fast_html' variable to have a DOCTYPE + declaration. - Made it possible to use associative arrays for the 'items' variable in theme_item_list(). - Fixed a bug which prevented required form elements without a title from being diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index d9ad8563a..d6c0d93f8 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -2518,7 +2518,7 @@ function drupal_fast_404() { $fast_paths = variable_get('404_fast_paths', FALSE); if ($fast_paths && preg_match($fast_paths, $_GET['q'])) { drupal_add_http_header('Status', '404 Not Found'); - $fast_404_html = variable_get('404_fast_html', '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'); + $fast_404_html = variable_get('404_fast_html', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'); // Replace @path in the variable with the page path. print strtr($fast_404_html, array('@path' => check_plain(request_uri()))); exit; diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 2ac6ed56b..2b207f224 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -490,7 +490,7 @@ ini_set('session.cookie_lifetime', 2000000); */ $conf['404_fast_paths_exclude'] = '/\/(?:styles)\//'; $conf['404_fast_paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'; -$conf['404_fast_html'] = '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'; +$conf['404_fast_html'] = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'; /** * By default the page request process will return a fast 404 page for missing |