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

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;
 	}