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

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-06-05 09:04:38 -05:00
parent 8624a40bf8 a2b1c7e66c
commit 27c878a537
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/wiki_controller.rb
View file

@ -229,9 +229,17 @@ class WikiController < ApplicationController
@page_name ||= 'HomePage' @page_name ||= 'HomePage'
@page ||= wiki.read_page(@web_name, @page_name) @page ||= wiki.read_page(@web_name, @page_name)
@link_mode ||= :publish @link_mode ||= :publish
render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error') and return unless @page if @page
@renderer = PageRenderer.new(@page.revisions.last) @renderer = PageRenderer.new(@page.revisions.last)
else
real_page = WikiReference.page_that_redirects_for(@web, @page_name)
if real_page
flash[:info] = "Redirected from \"#{@page_name}\"."
redirect_to :web => @web_name, :action => 'published', :id => real_page
else
render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error')
end
end
end end
def revision def revision
@ -311,7 +319,13 @@ class WikiController < ApplicationController
end end
else else
if not @page_name.nil? and @page_name.is_utf8? and not @page_name.empty? if not @page_name.nil? and @page_name.is_utf8? and not @page_name.empty?
real_page = WikiReference.page_that_redirects_for(@web, @page_name)
if real_page
flash[:info] = "Redirected from \"#{@page_name}\"."
redirect_to :web => @web_name, :action => 'show', :id => real_page
else
redirect_to :web => @web_name, :action => 'new', :id => @page_name redirect_to :web => @web_name, :action => 'new', :id => @page_name
end
else else
render :text => 'Page name is not specified', :status => 404, :layout => 'error' render :text => 'Page name is not specified', :status => 404, :layout => 'error'
end end