lib/logging_stuff.rb @@ -59,6 +59,7 @@ require_dependency 'instiki_errors' #require 'jcode' require 'caching_stuff' +require 'logging_stuff' #Additional Mime-types mime_types = YAML.load_file(File.join(File.dirname(__FILE__), 'mime_types.yml')) config/environment.rb @@ -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 && ![:publish, :s5].include?(mode) ) ? '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>} lib/url_generator.rb 883d82992c1f26f81130462d63ebf92123fc41b5 Jacques Distler distler@golem.ph.utexas.edu http://github.com/parasew/instiki/commit/c99ca26a8d14c8f0a91c9e11363bc2bad0d131de c99ca26a8d14c8f0a91c9e11363bc2bad0d131de 2009-10-27T22:03:25-07:00 2009-10-27T22:03:25-07:00 Better log rotation for Passenger Touch the tmp/restart.txt file, when rotatingthe log files. Otherwise, multiple workers may try to rotate the log files at the same time, with sub-optimal results. Also, an aesthetic tweak to the url_generator. 5eb30bf17599592cb25308233ea71fc39955faee Jacques Distler distler@golem.ph.utexas.edu