Sync with latest Instiki trunk. Changes:
1) Upgrade Rails to 1.2.3 2) Revert RedCloth to previous version (who %#$@ cares?) 3) Preserve the Rails Security fix to vendor/rails/actionpack/lib/action_controller/caching.rb from Revision 80.
This commit is contained in:
parent
ff3e03a45a
commit
7adac51d6d
68 changed files with 466 additions and 257 deletions
|
@ -539,7 +539,7 @@ module ActionController #:nodoc:
|
|||
end
|
||||
|
||||
def session_enabled?
|
||||
request.session_options[:disabled] != false
|
||||
request.session_options && request.session_options[:disabled] != false
|
||||
end
|
||||
|
||||
protected
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue