harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix namespace parsing issue

Browse Source
This commit is contained in:
zotlabs 2017-09-20 16:26:33 -07:00
parent 9e46472ca2
commit 90f759412b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zotlabs/Lib/ActivityStreams.php
View File

@ -58,7 +58,7 @@ class ActivityStreams {
$this->saved_recips = $arr; $this->saved_recips = $arr;
} }
function collect_recips($base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) { function collect_recips($base = '',$namespace = '') {
$x = []; $x = [];
$fields = [ 'to','cc','bto','bcc','audience']; $fields = [ 'to','cc','bto','bcc','audience'];
foreach($fields as $f) { foreach($fields as $f) {
@ -75,7 +75,7 @@ class ActivityStreams {
return $x; return $x;
} }
function expand($arr,$base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) { function expand($arr,$base = '',$namespace = '') {
$ret = []; $ret = [];
// right now use a hardwired recursion depth of 5 // right now use a hardwired recursion depth of 5
@ -103,8 +103,12 @@ class ActivityStreams {
function get_namespace($base,$namespace) { function get_namespace($base,$namespace) {
if(! $namespace)
return '';
$key = null; $key = null;
foreach( [ $this->data, $base ] as $b ) { foreach( [ $this->data, $base ] as $b ) {
if(! $b) if(! $b)
continue; continue;
@ -135,7 +139,7 @@ class ActivityStreams {
} }
function get_property_obj($property,$base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV ) { function get_property_obj($property,$base = '',$namespace = '' ) {
$prefix = $this->get_namespace($base,$namespace); $prefix = $this->get_namespace($base,$namespace);
if($prefix === null) if($prefix === null)
return null; return null;
@ -158,7 +162,7 @@ class ActivityStreams {
return null; return null;
} }
function get_compound_property($property,$base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) { function get_compound_property($property,$base = '',$namespace = '') {
$x = $this->get_property_obj($property,$base,$namespace); $x = $this->get_property_obj($property,$base,$namespace);
if($this->is_url($x)) { if($this->is_url($x)) {
$x = $this->fetch_property($x); $x = $this->fetch_property($x);
@ -173,7 +177,7 @@ class ActivityStreams {
return false; return false;
} }
function get_primary_type($base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) { function get_primary_type($base = '',$namespace = '') {
if(! $base) if(! $base)
$base = $this->data; $base = $this->data;
$x = $this->get_property_obj('type',$base,$namespace); $x = $this->get_property_obj('type',$base,$namespace);