aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-03-09 12:58:03 -0800
committerzotlabs <mike@macgirvin.com>2019-03-09 12:58:03 -0800
commit51024d382172c5e2e62bacc6d9103a1caa40e4a5 (patch)
tree37423abb2147b56945ac43a7ad0f13936890eec4 /Zotlabs
parent220d6ed494c1c1aa1bd1365f485e0543c2baa800 (diff)
downloadvolse-hubzilla-51024d382172c5e2e62bacc6d9103a1caa40e4a5.tar.gz
volse-hubzilla-51024d382172c5e2e62bacc6d9103a1caa40e4a5.tar.bz2
volse-hubzilla-51024d382172c5e2e62bacc6d9103a1caa40e4a5.zip
authenticated fetch fixes
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/ActivityStreams.php5
-rw-r--r--Zotlabs/Module/Item.php1
2 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index a357b6d69..006744aff 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -319,7 +319,10 @@ class ActivityStreams {
function get_compound_property($property, $base = '', $namespace = '', $first = false) {
$x = $this->get_property_obj($property, $base, $namespace);
if($this->is_url($x)) {
- $x = $this->fetch_property($x);
+ $y = $this->fetch_property($x);
+ if (is_array($y)) {
+ $x = $y;
+ }
}
// verify and unpack JSalmon signature if present
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index ebcf632ef..b247df0fd 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -55,6 +55,7 @@ class Item extends Controller {
$sigdata = HTTPSig::verify(EMPTY_STR);
if($sigdata['portable_id'] && $sigdata['header_valid']) {
$portable_id = $sigdata['portable_id'];
+ observer_auth($portable_id);
}
$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";