- Add variable for 'Today' label in date_today option (#1486120)

git-svn-id: https://svn.roundcube.net/trunk@4557 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 12 insertions, 1 deletions

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 568b3349d..f2923c52e 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1118,7 +1118,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;
 }