1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Change unless + else into if + else

This commit is contained in:
Shaliko Usubov 2012-05-06 21:49:31 +04:00
parent 80cfb5ff70
commit 5a2a72df0f

View file

@ -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)