update for redcloth 4 hotness
parent
fafd28320e
commit
d33597b4f9
|
@ -23,24 +23,15 @@ module Merb
|
||||||
def show_page_description(page)
|
def show_page_description(page)
|
||||||
page_cache = Cache.get(page.cache_name)
|
page_cache = Cache.get(page.cache_name)
|
||||||
if page_cache.nil?
|
if page_cache.nil?
|
||||||
redcloth_opts = [
|
desc = h(page.description.to_s).to_s.gsub(/\"\;/, '"').gsub(/\&\;/, '&')
|
||||||
:textile,
|
|
||||||
:block_textile_prefix,
|
|
||||||
:block_textile_lists,
|
|
||||||
:inline_textile_code,
|
|
||||||
:inline_textile_link,
|
|
||||||
:inline_textile_image,
|
|
||||||
:inline_textile_span,
|
|
||||||
:glyphs_textile
|
|
||||||
]
|
|
||||||
desc = h(page.description.to_s).to_s.gsub(/\"\;/, '"')
|
|
||||||
# i need pre/code block together... because i code :)
|
# i need pre/code block together... because i code :)
|
||||||
desc.gsub!("<pre><code>", "<pre><code>")
|
desc.gsub!("<pre><code>", "<pre><code>")
|
||||||
desc.gsub!("</pre></code>", "</pre></code>")
|
desc.gsub!("</code></pre>", "</code></pre>")
|
||||||
rc = RedCloth.new(desc)
|
rc = RedCloth.new(desc)
|
||||||
rc.no_span_caps = true
|
rc.no_span_caps = true
|
||||||
rc.filter_styles = true
|
rc.filter_styles = true
|
||||||
page_cache = rc.to_html(redcloth_opts).gsub(Page.wiki_word_pattern) do |match|
|
rc.filter_html = true
|
||||||
|
page_cache = rc.to_html.gsub(Page.wiki_word_pattern) do |match|
|
||||||
pg_name = $1
|
pg_name = $1
|
||||||
if Page.exists?(pg_name)
|
if Page.exists?(pg_name)
|
||||||
"<a class='wiki_link' style='color: #00F;' href='#{url(:page, pg_name.gsub(/ /, '_'))}'>#{pg_name}</a>"
|
"<a class='wiki_link' style='color: #00F;' href='#{url(:page, pg_name.gsub(/ /, '_'))}'>#{pg_name}</a>"
|
||||||
|
|
Reference in New Issue