Merge branch 'patch-20' into 'dev'
Beautiful embedding for Hubzilla links See merge request hubzilla/core!1360
This commit is contained in:
commit
b468069875
@ -272,6 +272,7 @@ function oembed_fetch_url($embedurl){
|
||||
}
|
||||
|
||||
$j['embedurl'] = $embedurl;
|
||||
$j['zrl'] = $is_matrix;
|
||||
|
||||
// logger('fetch return: ' . print_r($j,true));
|
||||
|
||||
@ -335,7 +336,11 @@ function oembed_format_object($j){
|
||||
|
||||
case "rich": {
|
||||
// not so safe..
|
||||
if($j['zrl']) {
|
||||
$ret = ((preg_match('/^<div[^>]+>(.*?)<\/div>$/is',$j['html'],$o)) ? $o[1] : $j['html']);
|
||||
} else {
|
||||
$ret.= $jhtml;
|
||||
};
|
||||
}; break;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user