Updated auto-link markup fix

halves · Feb 7, 2010 · 33c22cf · 33c22cf
1 parent 1467ab2
commit 33c22cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/config/initializers/b.patches/auto_link.rb b/config/initializers/b.patches/auto_link.rb
@@ -14,7 +14,8 @@ def auto_link_urls(text, html_options = {})
         href
       else
         # ADDED - START
-        if href.sub!(/&\w+;$/, '')
+        href.sub!(/&amp;/, '&')
+        if href.sub!(/&(quot|lt|gt);.*$/, '')
           punctuation = $&
         end
         # ADDED - END
@@ -30,7 +31,7 @@ def auto_link_urls(text, html_options = {})
         link_text = block_given?? yield(href) : href
         href = 'http://' + href unless href.index('http') == 0
 
-        content_tag(:a, h(link_text), link_attributes.merge('href' => href)) + punctuation
+        content_tag(:a, escape_once(link_text), link_attributes.merge('href' => href)) + punctuation
       end
     end
   end

diff --git a/spec/helpers/format_helper_spec.rb b/spec/helpers/format_helper_spec.rb
@@ -182,7 +182,10 @@ def do_find
     it 'should corretly auto-link in code-blocks' do
       helper.markup(%({{{\n<a href="http://retrospectiva.org/wiki/Retrospectiva" />\n}}})).
         should == %(<pre><code>&lt;a href=&quot;<a href="http://retrospectiva.org/wiki/Retrospectiva">http://retrospectiva.org/wiki/Retrospectiva</a>&quot; /&gt;\n</code></pre>)
+      helper.markup(%({{{\n<scheduler>http://retrospectiva.org/wiki/Retrospectiva?a=1&amp;b=2</scheduler>\n}}})).
+        should == %(<pre><code>&lt;scheduler&gt;<a href="http://retrospectiva.org/wiki/Retrospectiva?a=1&amp;b=2">http://retrospectiva.org/wiki/Retrospectiva?a=1&amp;b=2</a>&lt;/scheduler&gt;\n</code></pre>)
     end
+
 
   end