Merge branch 'onebox-safety' of git://github.com/tms/discourse
This commit is contained in:
commit
13b0b874fb
|
@ -20,6 +20,7 @@ module Oneboxer
|
|||
|
||||
@opts[:original_url] = @url
|
||||
@opts[:text] = @opts['description']
|
||||
@opts[:unsafe] = true
|
||||
|
||||
begin
|
||||
parsed = URI.parse(@url)
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue