aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactionpack/lib/action_view/helpers/date_helper.rb8
-rw-r--r--actionwebservice/Rakefile2
-rw-r--r--activesupport/Rakefile6
3 files changed, 9 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index c989100bbc..03a34c93f1 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -221,12 +221,8 @@ module ActionView
options_with_prefix = Proc.new { |position| options.update({ :prefix => "#{@object_name}[#{@method_name}(#{position}i)]" }) }
date = options[:include_blank] ? (value || 0) : (value || Date.today)
- date_select = ""
-
- if options[:month_before_year] # For backwards compatibility
- options[:order] = [:month, :year, :day]
- end
-
+ date_select = ""
+ options[:order] = [:month, :year, :day] if options[:month_before_year] # For backwards compatibility
options[:order] ||= [:year, :month, :day]
position = {:year => 1, :month => 2, :day => 3}
diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile
index 538f02cfbc..76f0ad422e 100644
--- a/actionwebservice/Rakefile
+++ b/actionwebservice/Rakefile
@@ -85,7 +85,7 @@ end
# Publish documentation
desc "Publish the API documentation"
task :pdoc => [:rdoc] do
- Rake::SshDirPublisher.new("davidhh@comox.textdrive.com", "public_html/as", "doc").upload
+ Rake::SshDirPublisher.new("davidhh@comox.textdrive.com", "public_html/aws", "doc").upload
end
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index 000e56b734..43c5751cdf 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -56,3 +56,9 @@ task :pgem => [:package] do
Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
`ssh davidhh@comox.textdrive.com './gemupdate.sh'`
end
+
+# Publish documentation
+desc "Publish the API documentation"
+task :pdoc => [:rdoc] do
+ Rake::SshDirPublisher.new("davidhh@comox.textdrive.com", "public_html/as", "doc").upload
+end