aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-18 11:10:40 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-18 11:10:40 +0200
commit178b440f05ff7356f313845fbfb307a838a29f8d (patch)
tree67e8385f1bac27c3d19fb0fd569c88dc266647df /Zotlabs/Module
parent9749bbcedcb0aa20330790ca7af838d00de45f05 (diff)
parent755dd67ec7856b8926bfb78e6034ddff1834b032 (diff)
downloadvolse-hubzilla-178b440f05ff7356f313845fbfb307a838a29f8d.tar.gz
volse-hubzilla-178b440f05ff7356f313845fbfb307a838a29f8d.tar.bz2
volse-hubzilla-178b440f05ff7356f313845fbfb307a838a29f8d.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Thing.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index e23cce565..65fc0588e 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -26,7 +26,7 @@ class Thing extends \Zotlabs\Web\Controller {
$verb = escape_tags($_REQUEST['verb']);
$activity = intval($_REQUEST['activity']);
$profile_guid = escape_tags($_REQUEST['profile_assign']);
- $url = $_REQUEST['link'];
+ $url = $_REQUEST['url'];
$photo = $_REQUEST['img'];
$hash = random_string();
@@ -235,7 +235,7 @@ class Thing extends \Zotlabs\Web\Controller {
}
- function get() {
+ function get() {
// @FIXME one problem with things is we can't share them unless we provide the channel in the url
// so we can definitively lookup the owner.