Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #673020 follow-up by attiks: Critical fix to Content-Language HTTP header to not cause issues with Drush.

merge-requests/26/head
webchick 2011-10-27 08:16:41 -07:00
parent 2dd2f4f2a2
commit 50fb0beb7d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/bootstrap.inc
View File

@ -2498,7 +2498,6 @@ function get_t() {
* Initialize all the defined language types. * Initialize all the defined language types.
*/ */
function drupal_language_initialize() { function drupal_language_initialize() {
global $language;
$types = language_types(); $types = language_types();
// Ensure the language is correctly returned, even without multilanguage // Ensure the language is correctly returned, even without multilanguage
@ -2518,9 +2517,6 @@ function drupal_language_initialize() {
// environments. // environments.
bootstrap_invoke_all('language_init'); bootstrap_invoke_all('language_init');
} }
// Send appropriate HTTP-Header for browsers and search engines.
header('Content-Language: ' . $language->language);
} }
/** /**

4
includes/common.inc
View File

@ -2466,6 +2466,10 @@ function drupal_deliver_html_page($page_callback_result) {
drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); drupal_add_http_header('Content-Type', 'text/html; charset=utf-8');
} }
// Send appropriate HTTP-Header for browsers and search engines.
global $language;
drupal_add_http_header('Content-Language', $language->language);
// Menu status constants are integers; page content is a string or array. // Menu status constants are integers; page content is a string or array.
if (is_int($page_callback_result)) { if (is_int($page_callback_result)) {
// @todo: Break these up into separate functions? // @todo: Break these up into separate functions?