Skip to content

Commit

Permalink
Merge 2e4df44 into c7a9c40
Browse files Browse the repository at this point in the history
  • Loading branch information
cmrd-senya committed Sep 11, 2018
2 parents c7a9c40 + 2e4df44 commit 275bb48
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions init.rb
Expand Up @@ -19,7 +19,6 @@
require 'config/initializers/session_store.rb'
rescue LoadError
end
require 'redmine/wiki_formatting/textile/redcloth3'

require_dependency 'wiki_extensions_notifiable_patch'
Dir::foreach(File.join(File.dirname(__FILE__), 'lib')) do |file|
Expand Down Expand Up @@ -90,7 +89,5 @@
:if => Proc.new{|proj| WikiExtensionsMenu.enabled?(proj.id, no)}
}

RedCloth3::ALLOWED_TAGS << "div"

activity_provider :wiki_comment, :class_name => 'WikiExtensionsComment', :default => false
end
8 changes: 4 additions & 4 deletions lib/wiki_extensions_wiki_controller_patch.rb
Expand Up @@ -89,10 +89,10 @@ def wiki_extensions_include_header
header = @wiki.find_page('Header')
return unless header
text = "\n"
text << '<div id="wiki_extentions_header">'
text << '<code></code>{{div_start_tag(wiki_extentions_header)}}'
text << "\n\n"
text << header.content.text
text << "\n\n</div>"
text << "\n\n<code></code>{{div_end_tag}}"
text << "\n\n"
text << @content.text
@content.text = text
Expand All @@ -105,10 +105,10 @@ def wiki_extensions_include_footer
return unless footer
text = @content.text
text << "\n"
text << '<div id="wiki_extentions_footer">'
text << '<code></code>{{div_start_tag(wiki_extentions_footer)}}'
text << "\n\n"
text << footer.content.text
text << "\n\n</div>"
text << "\n\n<code></code>{{div_end_tag}}"

end
end
Expand Down

0 comments on commit 275bb48

Please sign in to comment.