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

Fixes

Browse source 
Fix Session CookieOverflow bug when rescuing an InstikiValidation error.
Fix some random things which will cause problems with Ruby 1.9. (Plenty
more where those came from.)
This commit is contained in:
Jacques Distler 2008-11-05 22:24:14 -06:00
parent dfb0f5f347
commit bceb1864df
5 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/controllers/wiki_controller.rb
View file

@ -1,6 +1,5 @@
require 'fileutils'
require 'maruku'
require 'parsedate'
require 'zip/zip'
require 'stringsupport'
require 'resolv'
@ -241,30 +240,18 @@ class WikiController < ApplicationController
begin
the_content = params['content']
filter_spam(the_content)
raise Instiki::ValidationError.new('Your content was not valid utf-8.') unless the_content.is_utf8?
if @page
if the_content.is_utf8?
wiki.revise_page(@web_name, @page_name, the_content, Time.now,
Author.new(author_name, remote_ip), PageRenderer.new)
@page.unlock
else
flash[:error] = 'Your content was not valid utf-8.'
@page.unlock
redirect_to :back
return
end
wiki.revise_page(@web_name, @page_name, the_content, Time.now,
Author.new(author_name, remote_ip), PageRenderer.new)
@page.unlock
else
if the_content.is_utf8?
wiki.write_page(@web_name, @page_name, the_content, Time.now,
Author.new(author_name, remote_ip), PageRenderer.new)
else
flash[:error] = 'Your content was not valid utf-8.'
redirect_to :back
return
end
wiki.write_page(@web_name, @page_name, the_content, Time.now,
Author.new(author_name, remote_ip), PageRenderer.new)
end
redirect_to_page @page_name
rescue => e
flash[:error] = e
rescue Instiki::ValidationError => e
flash[:error] = e.to_s
logger.error e
if @page
@page.unlock
@ -285,7 +272,7 @@ class WikiController < ApplicationController
# the application itself (for application errors, it's better not to rescue the error at all)
rescue => e
logger.error e
flash[:error] = e
flash[:error] = e.to_s
if in_a_web?
redirect_to :action => 'edit', :web => @web_name, :id => @page_name
else