diff options
Diffstat (limited to 'program/include/main.inc')
| -rw-r--r-- | program/include/main.inc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 7be7488b5..3ac26dc17 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1067,7 +1067,18 @@ function format_date($date, $format=NULL) $out .= date($format{$i}, $timestamp); } - return $today ? (rcube_label('today') . ' ' . $out) : $out; + if ($today) { + $label = rcube_label('today'); + // replcae $ character with "Today" label (#1486120) + if (strpos($out, '$') !== false) { + $out = preg_replace('/\$/', $label, $out, 1); + } + else { + $out = $label . ' ' . $out; + } + } + + return $out; } @@ -1685,7 +1696,7 @@ function rcube_html_editor($mode='') { global $RCMAIL, $CONFIG; - $hook = $RCMAIL->plugins->exec_hook('hmtl_editor', array('mode' => $mode)); + $hook = $RCMAIL->plugins->exec_hook('html_editor', array('mode' => $mode)); if ($hook['abort']) return; |