aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-20 13:07:29 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-20 13:07:29 -0400
commit8cd9a1e4fc28d92d270e3f154c144123dca9044a (patch)
tree20e9d45895fdea5a1af3f4066a95c526e7476a20 /Zotlabs
parent20b4fc919871433df6111cbb8b3508fd1693123b (diff)
parentcc09f9a7a5f799a0811ba83799c0a3ac6598c476 (diff)
downloadvolse-hubzilla-8cd9a1e4fc28d92d270e3f154c144123dca9044a.tar.gz
volse-hubzilla-8cd9a1e4fc28d92d270e3f154c144123dca9044a.tar.bz2
volse-hubzilla-8cd9a1e4fc28d92d270e3f154c144123dca9044a.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs')
-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.