aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorShaliko Usubov <shaliko@ezid.ru>2012-05-06 21:49:31 +0400
committerShaliko Usubov <shaliko@ezid.ru>2012-05-06 21:49:31 +0400
commit5a2a72df0fba466461980d5a3a368015c349176f (patch)
tree524e231ddc06ed52a954f1dcc0de50ac85291876 /actionpack
parent80cfb5ff7048f94badc06e61fd7c4bf8f7e5524b (diff)
downloadrails-5a2a72df0fba466461980d5a3a368015c349176f.tar.gz
rails-5a2a72df0fba466461980d5a3a368015c349176f.tar.bz2
rails-5a2a72df0fba466461980d5a3a368015c349176f.zip
Change unless + else into if + else
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/date_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 6bd8e62e0d..f0a593d2c1 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -66,12 +66,12 @@ module ActionView
# distance_of_time_in_words(Time.now, Time.now) # => less than a minute
#
def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {})
- unless include_seconds_or_options.is_a?(Hash)
+ if include_seconds_or_options.is_a?(Hash)
+ options = include_seconds_or_options
+ else
ActiveSupport::Deprecation.warn "distance_of_time_in_words and time_ago_in_words now accept :include_seconds " +
"as a part of options hash, not a boolean argument", caller
options[:include_seconds] ||= !!include_seconds_or_options
- else
- options = include_seconds_or_options
end
from_time = from_time.to_time if from_time.respond_to?(:to_time)