allow deactivation of sanitization

This commit is contained in:
7rans
2010-10-27 14:17:24 -04:00
parent 26df05374c
commit 3e8d2773be
2 changed files with 15 additions and 9 deletions
+2 -2
View File
@@ -29,7 +29,7 @@ module Gollum
def render(no_follow = false)
sanitize_options = (
no_follow ? @wiki.history_sanitization : @wiki.sanitization
).to_h
)
data = extract_tex(@data)
data = extract_code(data)
data = extract_tags(data)
@@ -43,7 +43,7 @@ module Gollum
end
data = process_tags(data)
data = process_code(data)
data = Sanitize.clean(data, sanitize_options)
data = Sanitize.clean(data, sanitize_options.to_h) if sanitize_options
data = process_tex(data)
data.gsub!(/<p><\/p>/, '')
data
+13 -7
View File
@@ -15,11 +15,9 @@ module Gollum
# Sets the default email for commits.
attr_accessor :default_committer_email
#
attr_writer :sanitization_options
#
attr_writer :history_sanitization_options
# Sets sanitization options. Set to false to deactivate
# sanitization altogether.
attr_writer :sanitization
# Gets the page class used by all instances of this Wiki.
# Default: Gollum::Page.
@@ -45,7 +43,8 @@ module Gollum
#
def sanitization
@sanitization ||= Sanitization.new
return @sanitization unless @sanitization.nil?
@sanitization = Sanitization.new
end
end
@@ -89,7 +88,14 @@ module Gollum
#
# Returns a Sanitization instance.
def history_sanitization
@history_sanitiazation ||= sanitization.merge(Sanitization::HISTORY_OPTIONS)
return @history_sanitiazation unless @history_sanitiazation.nil?
@history_sanitiazation = (
if sanitization
sanitization.merge(Sanitization::HISTORY_OPTIONS)
else
false
end
)
end
# Public: check whether the wiki's git repo exists on the filesystem.