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

This commit is contained in:
Jacques Distler 2009-10-23 00:25:32 -05:00
commit 4764364480

View file

@ -102,14 +102,6 @@ class UrlGenerator < AbstractUrlGenerator
else else
%{<span class="newWikiWord">#{text}</span>} %{<span class="newWikiWord">#{text}</span>}
end end
when :show
if known_page
wikilink_for(mode, name, text, web_address)
else
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'new',
:id => name, :only_path => true
%{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
end
else else
if known_page if known_page
wikilink_for(mode, name, text, web_address) wikilink_for(mode, name, text, web_address)