jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5 from Bapabooiee/master

Browse Source 
Compatibility fixes for ruby-1.8
This commit is contained in:
r888888888
2011-09-06 08:05:13 -07:00
parent 33fa8d30ee feaa3353f2
commit 3290516aec
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@@ -23,7 +23,7 @@ module ApplicationHelper
end end
end end
def time_tag(content = nil, time) def time_tag(content, time)
zone = time.strftime("%z") zone = time.strftime("%z")
datetime = time.strftime("%Y-%m-%dT%H:%M" + zone[0, 3] + ":" + zone[3, 2]) datetime = time.strftime("%Y-%m-%dT%H:%M" + zone[0, 3] + ":" + zone[3, 2])

2
config/initializers/session_store.rb
View File

@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file. # 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, # Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information # which shouldn't be used to store highly confidential information

2
config/initializers/wrap_parameters.rb
View File

@@ -4,7 +4,7 @@
# is enabled by default. # is enabled by default.
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. # 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. # Disable root element in JSON by default.
if defined?(ActiveRecord) if defined?(ActiveRecord)