diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-07-16 02:37:06 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-07-16 02:37:06 +0000 |
commit | 2ad0a2c1f79b15ab74c734424a9d4a4d388028c2 (patch) | |
tree | ab48b7e5fd849d0b568e5829250aadbe2f274e07 /modules/node | |
parent | da75021509b179b6c42f633d16cd09a7e6ce339d (diff) | |
download | brdo-2ad0a2c1f79b15ab74c734424a9d4a4d388028c2.tar.gz brdo-2ad0a2c1f79b15ab74c734424a9d4a4d388028c2.tar.bz2 |
- Patch #684982 by plach: audit of global language variable use.
Diffstat (limited to 'modules/node')
-rw-r--r-- | modules/node/node.module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index 594df7241..5e875f281 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2354,7 +2354,7 @@ function node_block_list_alter(&$blocks) { * The link should be an absolute URL. */ function node_feed($nids = FALSE, $channel = array()) { - global $base_url, $language; + global $base_url, $language_content; if ($nids === FALSE) { $nids = db_select('node', 'n') @@ -2409,7 +2409,7 @@ function node_feed($nids = FALSE, $channel = array()) { 'title' => variable_get('site_name', 'Drupal'), 'link' => $base_url, 'description' => variable_get('feed_description', ''), - 'language' => $language->language + 'language' => $language_content->language ); $channel_extras = array_diff_key($channel, $channel_defaults); $channel = array_merge($channel_defaults, $channel); |