deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Instiki 0.16.3: Rails 2.3.0

Browse source 
Instiki now runs on the Rails 2.3.0 Candidate Release.
Among other improvements, this means that it now 
automagically selects between WEBrick and Mongrel.

Just run

    ./instiki --daemon
This commit is contained in:
Jacques Distler 2009-02-04 14:26:08 -06:00
parent 43aadecc99
commit 4e14ccc74d
893 changed files with 71965 additions and 28511 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application.rb → app/controllers/application_controller.rb
View file

@ -107,7 +107,7 @@ class ApplicationController < ActionController::Base
def remember_location
if request.method == :get and
response.headers['Status'] == '200 OK' and not \
@status == '200' and not \
%w(locked save back file pic import).include?(action_name)
session[:return_to] = request.request_uri
logger.debug "Session ##{session.object_id}: remembered URL '#{session[:return_to]}'"
@ -115,7 +115,7 @@ class ApplicationController < ActionController::Base
end
def rescue_action_in_public(exception)
if exception.instance_of?(CGI::Session::CookieStore::TamperedWithCookie)
if exception.instance_of?(ActiveController::Session::CookieStore::TamperedWithCookie)
render :text => 'Stale session. Please reload the page.', :status =>500, :layout => 'error'
else
render :status => 500, :text => <<-EOL
@ -241,7 +241,7 @@ module Instiki
module VERSION #:nodoc:
MAJOR = 0
MINOR = 16
TINY = 2
TINY = 3
SUFFIX = '(MML+)'
PRERELEASE = false
if PRERELEASE