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

This commit is contained in:
Jacques Distler 2009-10-23 10:08:21 -05:00
commit 698c194b63

View file

@ -177,7 +177,7 @@ class UrlGenerator < AbstractUrlGenerator
def wikilink_for(mode, name, text, web_address)
web = Web.find_by_address(web_address)
action = web.published? && !(web == @web && mode != :publish) ? 'published' : 'show'
action = web.published? && !(web == @web && ![:publish, :s5].include?(mode) ) ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}