From ddc454bd8260f39831f0d9cb86f797798ef73322 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 9 Jul 2017 16:02:45 -0700 Subject: regression: allow position attributes in oembedable zcards by separating allow_position from the decision to allow zrls. Should probably turn the entire zcard into a gd image as other consumers of zcards are also likely to purify the position attributes. --- include/oembed.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/oembed.php b/include/oembed.php index e35a77fa3..460e0244e 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -134,7 +134,9 @@ function oembed_fetch_url($embedurl){ $txt = null; // we should try to cache this and avoid a lookup on each render - $zrl = ((get_config('system','oembed_zrl')) ? is_matrix_url($embedurl) : false); + $is_matrix = is_matrix_url($embedurl); + + $zrl = ((get_config('system','oembed_zrl')) ? $is_matrix : false); $furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl); @@ -222,7 +224,7 @@ function oembed_fetch_url($embedurl){ if($action === 'filter') { if($j['html']) { $orig = $j['html']; - $allow_position = (($zrl) ? true : false); + $allow_position = (($is_matrix) ? true : false); $j['html'] = purify_html($j['html'],$allow_position); if($j['html'] != $orig) { logger('oembed html was purified. original: ' . $orig . ' purified: ' . $j['html'], LOGGER_DEBUG, LOG_INFO); -- cgit v1.2.3