diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
| commit | db9ea66069f2a2df6044e8267a68eae377c45911 (patch) | |
| tree | aa93597df2ee43ceeaa980db864b58143f2e06df /Zotlabs/Module/Linkinfo.php | |
| parent | ef02464e3c3188563349bfda42585ce40cdb45ad (diff) | |
| parent | c2830c4a98cf3c9983b3c4b61024d52a6d7187df (diff) | |
| download | volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.gz volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.bz2 volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'Zotlabs/Module/Linkinfo.php')
| -rw-r--r-- | Zotlabs/Module/Linkinfo.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index e1a3a6abe..8f8231c49 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -13,7 +13,7 @@ class Linkinfo extends \Zotlabs\Web\Controller { $text = null; $str_tags = ''; - + $process_oembed = true; $br = "\n"; @@ -22,6 +22,11 @@ class Linkinfo extends \Zotlabs\Web\Controller { else $url = trim($_GET['url']); + if(substr($url,0,1) === '!') { + $process_oembed = false; + $url = substr($url,1); + } + $url = strip_zids($url); if((substr($url,0,1) != '/') && (substr($url,0,4) != 'http')) @@ -91,10 +96,12 @@ class Linkinfo extends \Zotlabs\Web\Controller { killme(); } - $x = oembed_process($url); - if($x) { - echo $x; - killme(); + if($process_oembed) { + $x = oembed_process($url); + if($x) { + echo $x; + killme(); + } } if($url && $title && $text) { |