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 2011-07-28 23:18:14 -05:00
parent 8d7f33f99b 52da76ff38
commit 7d2275d0a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/wiki_controller.rb
View file

@ -280,7 +280,7 @@ EOL
else else
real_page = WikiReference.page_that_redirects_for(@web, @page_name) real_page = WikiReference.page_that_redirects_for(@web, @page_name)
if real_page if real_page
flash[:info] = "Redirected from \"#{@page_name}\"." flash[:info] = "Redirected from \"#{@page_name}\".".html_safe
redirect_to :web => @web_name, :action => 'published', :id => real_page, :status => 301 redirect_to :web => @web_name, :action => 'published', :id => real_page, :status => 301
else else
render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error') render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error')
@ -366,11 +366,11 @@ EOL
if not @page_name.nil? and not @page_name.empty? if not @page_name.nil? and not @page_name.empty?
real_page = WikiReference.page_that_redirects_for(@web, @page_name) real_page = WikiReference.page_that_redirects_for(@web, @page_name)
if real_page if real_page
flash[:info] = "Redirected from \"#{@page_name}\"." flash[:info] = "Redirected from \"#{@page_name}\".".html_safe
redirect_to :web => @web_name, :action => 'show', :id => real_page, :status => 301 redirect_to :web => @web_name, :action => 'show', :id => real_page, :status => 301
else else
flash[:info] = "Page \"#{@page_name}\" does not exist.\n" + flash[:info] = "Page \"#{@page_name}\" does not exist.\n" +
"Please create it now, or hit the \"back\" button in your browser." "Please create it now, or hit the \"back\" button in your browser.".html_safe
redirect_to :web => @web_name, :action => 'new', :id => @page_name redirect_to :web => @web_name, :action => 'new', :id => @page_name
end end
else else