Merge branch 'master' into 'master'

Preserve p tags so that Mastodon notices render properly

See merge request !95
This commit is contained in:
hannes 2017-05-29 09:50:41 +00:00
commit 60f207aa72

View File

@ -2308,9 +2308,9 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
}); });
// if statusnetHTML is contains <p>:s, unwrap those (diaspora..) // if statusnetHTML is contains <p>:s, unwrap those (diaspora..)
statusnetHTML.children('p').each(function(){ /*statusnetHTML.children('p').each(function(){
$(this).contents().unwrap(); $(this).contents().unwrap();
}); });*/
// bookmarks created by the bookmark plugin get's a tooltip // bookmarks created by the bookmark plugin get's a tooltip
statusnetHTML.find('.xfolkentry').each(function(){ statusnetHTML.find('.xfolkentry').each(function(){