diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-08-26 10:56:12 +0100 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-08-26 10:56:12 +0100 |
| commit | 450cbf6320b7bf3868f63d64ec4603df86d506d4 (patch) | |
| tree | 45baccc98ba22fd1d930aaf10a9761c24e3c41fc | |
| parent | c96fb3799e233abe168bc8edd1bc9e1f47aa2f0b (diff) | |
| download | brdo-450cbf6320b7bf3868f63d64ec4603df86d506d4.tar.gz brdo-450cbf6320b7bf3868f63d64ec4603df86d506d4.tar.bz2 | |
- Patch #988878 by Shyamala, Dave Reid: system_tokens() references a not initialized variable.
| -rw-r--r-- | modules/system/system.tokens.inc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/system/system.tokens.inc b/modules/system/system.tokens.inc index a96142327..b612d1057 100644 --- a/modules/system/system.tokens.inc +++ b/modules/system/system.tokens.inc @@ -130,10 +130,13 @@ function system_token_info() { */ function system_tokens($type, $tokens, array $data = array(), array $options = array()) { $url_options = array('absolute' => TRUE); - if (isset($language)) { - $url_options['language'] = $language; + if (isset($options['language'])) { + $url_options['language'] = $options['language']; + $language_code = $options['language']->language; + } + else { + $language_code = NULL; } - $langcode = (isset($language) ? $language->language : NULL); $sanitize = !empty($options['sanitize']); $replacements = array(); @@ -181,19 +184,19 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a foreach ($tokens as $name => $original) { switch ($name) { case 'short': - $replacements[$original] = format_date($date, 'short', '', NULL, $langcode); + $replacements[$original] = format_date($date, 'short', '', NULL, $language_code); break; case 'medium': - $replacements[$original] = format_date($date, 'medium', '', NULL, $langcode); + $replacements[$original] = format_date($date, 'medium', '', NULL, $language_code); break; case 'long': - $replacements[$original] = format_date($date, 'long', '', NULL, $langcode); + $replacements[$original] = format_date($date, 'long', '', NULL, $language_code); break; case 'since': - $replacements[$original] = format_interval((REQUEST_TIME - $date), 2, $langcode); + $replacements[$original] = format_interval((REQUEST_TIME - $date), 2, $language_code); break; case 'raw': @@ -204,7 +207,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a if ($created_tokens = token_find_with_prefix($tokens, 'custom')) { foreach ($created_tokens as $name => $original) { - $replacements[$original] = format_date($date, 'custom', $name, NULL, $langcode); + $replacements[$original] = format_date($date, 'custom', $name, NULL, $language_code); } } } @@ -242,7 +245,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a // These tokens are default variations on the chained tokens handled below. case 'timestamp': - $replacements[$original] = format_date($file->timestamp, 'medium', '', NULL, $langcode); + $replacements[$original] = format_date($file->timestamp, 'medium', '', NULL, $language_code); break; case 'owner': |