aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-09-28 10:36:38 +0200
committerMario <mario@mariovavti.com>2019-09-28 10:36:38 +0200
commitd0055310baf8d608af8fc72976bfeaa242273a04 (patch)
treed3067651098c636e6093ada64f3b65881ade1eed /Zotlabs
parentec65211d54d07787871befe0e4658a469a735301 (diff)
parentb6590e95b5429ec50eccd3bb9c70ff0127dbd1cb (diff)
downloadvolse-hubzilla-d0055310baf8d608af8fc72976bfeaa242273a04.tar.gz
volse-hubzilla-d0055310baf8d608af8fc72976bfeaa242273a04.tar.bz2
volse-hubzilla-d0055310baf8d608af8fc72976bfeaa242273a04.zip
Merge branch 'dev' into 'dev'
issue with bearcap tests See merge request hubzilla/core!1738
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index bcf017286..b74f6b2bc 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -80,6 +80,7 @@ class Activity {
$token = substr($p,2);
}
}
+ $m = parse_url($url);
}
}