summaryrefslogtreecommitdiff
path: root/program/include/main.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-02-24 12:12:09 +0000
committeralecpl <alec@alec.pl>2011-02-24 12:12:09 +0000
commit9b624ba1493786bf2a03a4bb5f6faa173736c899 (patch)
treeab588c89865bc5bbb0637c0b2ea06c99a890a23b /program/include/main.inc
parent207cc0b9b3cfdfb29e4f02e83014320fd12eeb68 (diff)
- Merge fixes from trunk
Diffstat (limited to 'program/include/main.inc')
-rw-r--r--program/include/main.inc15
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;