@@ -273,7 +273,8 @@ class WikiController < ApplicationController if @page new_name = params['new_name'] ? params['new_name'].purify : @page_name raise Instiki::ValidationError.new('Your new title cannot contain a "."') if new_name.include? '.' - raise Instiki::ValidationError.new('A page named "' + new_name.escapeHTML + '" already exists.') if @page_name != new_name && @web.has_page?(new_name) + raise Instiki::ValidationError.new('A page named "' + new_name.escapeHTML + '" already exists.') if + @page_name != new_name && @web.has_page?(new_name) wiki.revise_page(@web_name, @page_name, new_name, the_content, Time.now, Author.new(author_name, remote_ip), PageRenderer.new) @page.unlock @@ -286,11 +287,15 @@ class WikiController < ApplicationController rescue Instiki::ValidationError => e flash[:error] = e.to_s logger.error e + param_hash = {:web => @web_name, :id => @page_name} + # Work around Rails bug: flash will not display if query string is longer than 10192 bytes + param_hash.update( :content => the_content ) if the_content && + CGI::escape(the_content).length < 10183 && the_content != @page.current_revision.content if @page @page.unlock - redirect_to :action => 'edit', :web => @web_name, :id => @page_name, :content => the_content + redirect_to param_hash.update( :action => 'edit' ) else - redirect_to :action => 'new', :web => @web_name, :id => @page_name, :content => the_content + redirect_to param_hash.update( :action => 'new' ) end end end app/controllers/wiki_controller.rb 0cbeda005da13e2b46a603be1074f1b389229e00 20c99df4408514effe0e635855ecb1b006a5013a Jacques Distler distler@golem.ph.utexas.edu http://github.com/parasew/instiki/commit/6e8c25d96a0314d33e78df86e6455c7320c650dd 6e8c25d96a0314d33e78df86e6455c7320c650dd 2009-10-19T16:26:34-07:00 2009-10-19T16:26:34-07:00 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 354389d61c69b4457ab609cb12801e638b7e2cac Jacques Distler distler@golem.ph.utexas.edu