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

app/controllers/application_controller.rb

@@ -19,11 +19,13 @@ class ApplicationController < ActionController::Base
     Wiki.new
   end
 
+  protected
+
   def xhtml_enabled?
     in_a_web? and [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
   end
 
-  protected
+  helper_method :xhtml_enabled?
 
   def check_authorization
     if in_a_web? and authorization_needed? and not authorized?

app/views/layouts/default.rhtml

@@ -41,7 +41,7 @@
 <div id="Container">
 <div id="Content">
   <h1 id="pageName">
-    <%= render(:file => 'svg_logo') if @controller.xhtml_enabled? %>
+    <%= render(:file => 'svg_logo') if xhtml_enabled? %>
     <%- if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) -%>
       <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
     <%- elsif @web -%>