harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-10-31 09:39:10 +01:00
commit 0252bac4ba
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/oembed.php
View File

@ -272,6 +272,7 @@ function oembed_fetch_url($embedurl){
} }
$j['embedurl'] = $embedurl; $j['embedurl'] = $embedurl;
$j['zrl'] = $is_matrix;
// logger('fetch return: ' . print_r($j,true)); // logger('fetch return: ' . print_r($j,true));
@ -335,7 +336,11 @@ function oembed_format_object($j){
case "rich": { case "rich": {
// not so safe.. // not so safe..
$ret.= $jhtml; if($j['zrl']) {
$ret = ((preg_match('/^<div[^>]+>(.*?)<\/div>$/is',$j['html'],$o)) ? $o[1] : $j['html']);
} else {
$ret.= $jhtml;
};
}; break; }; break;
} }