diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-06-25 12:42:07 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-06-25 12:42:07 +0000 |
| commit | 7e5b440c108442c165d177b373584a9da88aa06b (patch) | |
| tree | b4b6e7864f48b2a5b922f54f052f788134692f69 | |
| parent | 7093495f7c209d712ce951cb57781710f19f2653 (diff) | |
| download | brdo-7e5b440c108442c165d177b373584a9da88aa06b.tar.gz brdo-7e5b440c108442c165d177b373584a9da88aa06b.tar.bz2 | |
#154309 by KarenS: language code lost in format_date() when using the 'r' format
| -rw-r--r-- | includes/common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 2afa0dbee..f1cb4cfc5 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1121,7 +1121,7 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL $date .= gmdate($c, $timestamp); } else if ($c == 'r') { - $date .= format_date($timestamp - $timezone, 'custom', 'D, d M Y H:i:s O', $timezone); + $date .= format_date($timestamp - $timezone, 'custom', 'D, d M Y H:i:s O', $timezone, $langcode); } else if ($c == 'O') { $date .= sprintf('%s%02d%02d', ($timezone < 0 ? '-' : '+'), abs($timezone / 3600), abs($timezone % 3600) / 60); @@ -2124,7 +2124,7 @@ function drupal_to_js($var) { /** * Return data in JSON format. - * + * * This function should be used for JavaScript callback functions returning * data in JSON format. It sets the header for JavaScript output. * |