aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-26 16:44:54 -0700
committerzotlabs <mike@macgirvin.com>2016-10-26 16:44:54 -0700
commitaee274295136b80be7173a60be17b2f8e46b19a8 (patch)
tree50586e88c641a2703dd6bbdfc853941608716a18 /Zotlabs/Module
parentc3af36d33b9a08aacecd572ad17fe33362617d23 (diff)
downloadvolse-hubzilla-aee274295136b80be7173a60be17b2f8e46b19a8.tar.gz
volse-hubzilla-aee274295136b80be7173a60be17b2f8e46b19a8.tar.bz2
volse-hubzilla-aee274295136b80be7173a60be17b2f8e46b19a8.zip
when inserting a link, if the url begins with '!' ignore oembed and do everytthing old school.
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Linkinfo.php17
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) {