mirror of
https://github.com/codeninjasllc/discourse.git
synced 2025-02-25 16:04:22 -05:00
Merge branch 'onebox-safety' of git://github.com/tms/discourse
This commit is contained in:
commit
13b0b874fb
6 changed files with 11 additions and 5 deletions
|
@ -20,6 +20,7 @@ module Oneboxer
|
||||||
|
|
||||||
@opts[:original_url] = @url
|
@opts[:original_url] = @url
|
||||||
@opts[:text] = @opts['description']
|
@opts[:text] = @opts['description']
|
||||||
|
@opts[:unsafe] = true
|
||||||
|
|
||||||
begin
|
begin
|
||||||
parsed = URI.parse(@url)
|
parsed = URI.parse(@url)
|
||||||
|
|
|
@ -12,7 +12,12 @@
|
||||||
{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
|
{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
|
||||||
<h3><a href="{{original_url}}" target="_blank">{{title}}</a></h3>
|
<h3><a href="{{original_url}}" target="_blank">{{title}}</a></h3>
|
||||||
{{#by_info}}<h4>{{by_info}}</h4>{{/by_info}}
|
{{#by_info}}<h4>{{by_info}}</h4>{{/by_info}}
|
||||||
|
{{#unsafe}}
|
||||||
|
{{text}}
|
||||||
|
{{/unsafe}}
|
||||||
|
{{^unsafe}}
|
||||||
{{{text}}}
|
{{{text}}}
|
||||||
|
{{/unsafe}}
|
||||||
</div>
|
</div>
|
||||||
<div class='clearfix'></div>
|
<div class='clearfix'></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue