Merge branch 'onebox-safety' of git://github.com/tms/discourse

This commit is contained in:
Robin Ward 2013-02-19 16:15:35 -05:00
commit 13b0b874fb
6 changed files with 11 additions and 5 deletions

View File

@ -20,6 +20,7 @@ module Oneboxer
@opts[:original_url] = @url
@opts[:text] = @opts['description']
@opts[:unsafe] = true
begin
parsed = URI.parse(@url)

View File

@ -12,7 +12,12 @@
{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
<h3><a href="{{original_url}}" target="_blank">{{title}}</a></h3>
{{#by_info}}<h4>{{by_info}}</h4>{{/by_info}}
{{#unsafe}}
{{text}}
{{/unsafe}}
{{^unsafe}}
{{{text}}}
{{/unsafe}}
</div>
<div class='clearfix'></div>
</div>