diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node.module | 5 | ||||
| -rw-r--r-- | modules/node/node.module | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/node.module b/modules/node.module index d750593cb..e4773d569 100644 --- a/modules/node.module +++ b/modules/node.module @@ -993,8 +993,7 @@ function node_block($op = 'list', $delta = 0) { * The link should be an absolute URL. */ function node_feed($nodes = 0, $channel = array()) { - global $base_url; - $languages = (function_exists('locale')) ? locale_supported_languages() : array('name' => array()); + global $base_url, $locale; if (!$nodes) { $nodes = db_query_range('SELECT nid FROM {node} WHERE promote = 1 AND status = 1 ORDER BY created DESC', 0, 15); @@ -1012,7 +1011,7 @@ function node_feed($nodes = 0, $channel = array()) { 'title' => variable_get('site_name', 'drupal') .' - '. variable_get('site_slogan', ''), 'link' => $base_url, 'description' => variable_get('site_mission', ''), - 'language' => (($key = reset(array_keys($languages['name']))) ? $key : 'en') + 'language' => $locale ); $channel = array_merge($channel_defaults, $channel); diff --git a/modules/node/node.module b/modules/node/node.module index d750593cb..e4773d569 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -993,8 +993,7 @@ function node_block($op = 'list', $delta = 0) { * The link should be an absolute URL. */ function node_feed($nodes = 0, $channel = array()) { - global $base_url; - $languages = (function_exists('locale')) ? locale_supported_languages() : array('name' => array()); + global $base_url, $locale; if (!$nodes) { $nodes = db_query_range('SELECT nid FROM {node} WHERE promote = 1 AND status = 1 ORDER BY created DESC', 0, 15); @@ -1012,7 +1011,7 @@ function node_feed($nodes = 0, $channel = array()) { 'title' => variable_get('site_name', 'drupal') .' - '. variable_get('site_slogan', ''), 'link' => $base_url, 'description' => variable_get('site_mission', ''), - 'language' => (($key = reset(array_keys($languages['name']))) ? $key : 'en') + 'language' => $locale ); $channel = array_merge($channel_defaults, $channel); |