Merge remote-tracking branch 'upstream/develop' into 1602-diaspora

This commit is contained in:
Michael Vogel 2016-03-23 06:59:20 +01:00
commit e8c07aaac6

View file

@ -311,6 +311,9 @@ function tryoembed($match){
$o = oembed_fetch_url($url);
if (!is_object($o))
return $match[0];
if (isset($match[2]))
$o->title = $match[2];