From feaa3353f2a22160da7edf1214498d06e1988a1b Mon Sep 17 00:00:00 2001 From: Dean Matzkov Date: Tue, 6 Sep 2011 01:36:57 -0600 Subject: [PATCH] Fixed a few ruby19-isms for compatibility with ruby18 --- app/helpers/application_helper.rb | 2 +- config/initializers/session_store.rb | 2 +- config/initializers/wrap_parameters.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 254503f97..3b3aa68c3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -23,7 +23,7 @@ module ApplicationHelper end end - def time_tag(content = nil, time) + def time_tag(content, time) zone = time.strftime("%z") datetime = time.strftime("%Y-%m-%dT%H:%M" + zone[0, 3] + ":" + zone[3, 2]) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 1d6eea98d..763563086 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,6 +1,6 @@ # Be sure to restart your server when you modify this file. -Danbooru::Application.config.session_store :cookie_store, key: '_danbooru_session' +Danbooru::Application.config.session_store :cookie_store, :key => '_danbooru_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index 16c324357..71b88b0b4 100644 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -4,7 +4,7 @@ # is enabled by default. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActionController::Base.wrap_parameters format: [:json] +ActionController::Base.wrap_parameters :format => [:json] # Disable root element in JSON by default. if defined?(ActiveRecord)