allow deactivation of sanitization
This commit is contained in:
@@ -29,7 +29,7 @@ module Gollum
|
|||||||
def render(no_follow = false)
|
def render(no_follow = false)
|
||||||
sanitize_options = (
|
sanitize_options = (
|
||||||
no_follow ? @wiki.history_sanitization : @wiki.sanitization
|
no_follow ? @wiki.history_sanitization : @wiki.sanitization
|
||||||
).to_h
|
)
|
||||||
data = extract_tex(@data)
|
data = extract_tex(@data)
|
||||||
data = extract_code(data)
|
data = extract_code(data)
|
||||||
data = extract_tags(data)
|
data = extract_tags(data)
|
||||||
@@ -43,7 +43,7 @@ module Gollum
|
|||||||
end
|
end
|
||||||
data = process_tags(data)
|
data = process_tags(data)
|
||||||
data = process_code(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 = process_tex(data)
|
||||||
data.gsub!(/<p><\/p>/, '')
|
data.gsub!(/<p><\/p>/, '')
|
||||||
data
|
data
|
||||||
|
|||||||
+13
-7
@@ -15,11 +15,9 @@ module Gollum
|
|||||||
# Sets the default email for commits.
|
# Sets the default email for commits.
|
||||||
attr_accessor :default_committer_email
|
attr_accessor :default_committer_email
|
||||||
|
|
||||||
#
|
# Sets sanitization options. Set to false to deactivate
|
||||||
attr_writer :sanitization_options
|
# sanitization altogether.
|
||||||
|
attr_writer :sanitization
|
||||||
#
|
|
||||||
attr_writer :history_sanitization_options
|
|
||||||
|
|
||||||
# Gets the page class used by all instances of this Wiki.
|
# Gets the page class used by all instances of this Wiki.
|
||||||
# Default: Gollum::Page.
|
# Default: Gollum::Page.
|
||||||
@@ -45,7 +43,8 @@ module Gollum
|
|||||||
|
|
||||||
#
|
#
|
||||||
def sanitization
|
def sanitization
|
||||||
@sanitization ||= Sanitization.new
|
return @sanitization unless @sanitization.nil?
|
||||||
|
@sanitization = Sanitization.new
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
@@ -89,7 +88,14 @@ module Gollum
|
|||||||
#
|
#
|
||||||
# Returns a Sanitization instance.
|
# Returns a Sanitization instance.
|
||||||
def history_sanitization
|
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
|
end
|
||||||
|
|
||||||
# Public: check whether the wiki's git repo exists on the filesystem.
|
# Public: check whether the wiki's git repo exists on the filesystem.
|
||||||
|
|||||||
Reference in New Issue
Block a user