Make xhtml_enabled? a Protected Method
... as it should be. Remarkably, it's still possible to use it in views, if you declare it a helper method.
This commit is contained in:
parent
d3e79ea84a
commit
f3b69bc57b
|
@ -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?
|
||||
|
|
|
@ -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 -%>
|
||||
|
|
Loading…
Reference in a new issue