diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-11-05 09:55:23 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-11-05 09:55:23 +0100 |
commit | 4830a1559d5ad9f59d809bf3d693592d3f7c8ab2 (patch) | |
tree | db87b400af1f3de1ca01bccef58b0bf4e55b1241 /include/oembed.php | |
parent | c8dd516d6c743d0371dc2ccb476eb70bcc17fa0a (diff) | |
parent | 92ea3ef72036c39601b69565f3e03fa44ad9aef7 (diff) | |
download | volse-hubzilla-4830a1559d5ad9f59d809bf3d693592d3f7c8ab2.tar.gz volse-hubzilla-4830a1559d5ad9f59d809bf3d693592d3f7c8ab2.tar.bz2 volse-hubzilla-4830a1559d5ad9f59d809bf3d693592d3f7c8ab2.zip |
Merge branch 'dev'
Diffstat (limited to 'include/oembed.php')
-rwxr-xr-x | include/oembed.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/oembed.php b/include/oembed.php index 41ab001d3..e5557dc11 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -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.. - $ret.= $jhtml; + if($j['zrl']) { + $ret = ((preg_match('/^<div[^>]+>(.*?)<\/div>$/is',$j['html'],$o)) ? $o[1] : $j['html']); + } else { + $ret.= $jhtml; + }; }; break; } |