diff options
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Network.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 0a7e40e0e..8cc0f6aa5 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -265,7 +265,7 @@ class ThreadItem { $this->check_wall_to_wall(); if($this->is_toplevel()) { - if(($conv->get_profile_owner() === local_channel()) || (local_channel() && App::$module === 'pubstream')) { + if((local_channel() && $conv->get_profile_owner() === local_channel()) || (local_channel() && App::$module === 'pubstream')) { $star = [ 'toggle' => t("Toggle Star Status"), 'isstarred' => ((intval($item['item_starred'])) ? true : false), @@ -286,7 +286,7 @@ class ThreadItem { $tagger = []; // FIXME - check this permission - if($conv->get_profile_owner() == local_channel()) { + if(local_channel() && $conv->get_profile_owner() == local_channel()) { /* disable until we agree on how to implemnt this in zot6/activitypub $tagger = array( 'tagit' => t("Add Tag"), diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 279875544..00fed55c2 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -374,9 +374,9 @@ class Network extends \Zotlabs\Web\Controller { // ActivityStreams specification. if (substr($verb, 0, 1) === '.') { - $verb = substr($verb, 1); + $sql_verb = substr($verb, 1); $sql_extra .= sprintf(" AND item.obj_type like '%s' ", - dbesc(protect_sprintf('%' . $verb . '%')) + dbesc(protect_sprintf('%' . $sql_verb . '%')) ); } else { |