aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-07-17 16:08:17 -0400
committerJosé Valim <jose.valim@gmail.com>2010-07-18 11:31:54 +0200
commit1f499e6d4cb1055de952957e3c9bd770e0219cc1 (patch)
tree05c132ca0729205979926d965459d0c177f418ce /actionpack
parent4a0d7c1a439c6ad8d35bf514761824e51fa07df2 (diff)
downloadrails-1f499e6d4cb1055de952957e3c9bd770e0219cc1.tar.gz
rails-1f499e6d4cb1055de952957e3c9bd770e0219cc1.tar.bz2
rails-1f499e6d4cb1055de952957e3c9bd770e0219cc1.zip
fixing the ternary operation where the logic is very confusing.
[#5136 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/date_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index f097b9a5a3..8050669adb 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -800,7 +800,8 @@ module ActionView
start = options.delete(:start) || 0
stop = options.delete(:end) || 59
step = options.delete(:step) || 1
- leading_zeros = options.delete(:leading_zeros).nil? ? true : false
+ options.reverse_merge!({:leading_zeros => true})
+ leading_zeros = options.delete(:leading_zeros)
select_options = []
start.step(stop, step) do |i|