diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-03-20 07:23:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-03-20 07:23:33 +0000 |
| commit | 46a4151f09359c9c64a2073d20c0267d64cdb516 (patch) | |
| tree | 1a73fce98be4bb0c2019cfa62120d6afff4fa4cd /lib | |
| parent | 4aef2735c878bf625527fea04dfefd16f714e896 (diff) | |
| download | redmine-46a4151f09359c9c64a2073d20c0267d64cdb516.tar.gz redmine-46a4151f09359c9c64a2073d20c0267d64cdb516.zip | |
Send a single email to admins like other notifications (#21421).
git-svn-id: http://svn.redmine.org/redmine/trunk@15266 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/i18n.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index b6998e72c..5d5856746 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -71,8 +71,9 @@ module Redmine ::I18n.l(date.to_date, options) end - def format_time(time, include_date=true, user=User.current) + def format_time(time, include_date=true, user=nil) return nil unless time + user ||= User.current options = {} options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format) time = time.to_time if time.is_a?(String) |