diff options
| author | Max Kostikov <max@kostikov.co> | 2020-09-17 19:47:44 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-09-17 19:47:44 +0200 |
| commit | 02cf85fa344b028ba2275ed44909ad9eefe7be92 (patch) | |
| tree | 0732ac67cc4c44625278179fa54b62c20326dfe4 /Zotlabs | |
| parent | 5271232aa5428f171ba1dedc42165a6a1611334e (diff) | |
| parent | 76a6e0b6fcda9ab87a8f6ec3ee8873d4fcdb4cd4 (diff) | |
| download | volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.tar.gz volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.tar.bz2 volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Addons.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index fadc38b38..024502d2a 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -287,12 +287,16 @@ class ThreadItem { $settings = ''; + $tagger = []; + // FIXME - check this permission if($conv->get_profile_owner() == local_channel()) { + /* disable until we agree on how to implemnt this in zot6/activitypub $tagger = array( 'tagit' => t("Add Tag"), 'classtagger' => "", ); + */ $settings = t('Conversation Tools'); } diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php index 243eb242f..b67ab7b3a 100644 --- a/Zotlabs/Module/Admin/Addons.php +++ b/Zotlabs/Module/Admin/Addons.php @@ -18,7 +18,7 @@ class Addons { @include_once("addon/" . argv(2) . "/" . argv(2) . ".php"); if(function_exists(argv(2).'_plugin_admin_post')) { $func = argv(2) . '_plugin_admin_post'; - $func($a); + $func(); } goaway(z_root() . '/admin/addons/' . argv(2) ); @@ -332,7 +332,7 @@ class Addons { @require_once("addon/$plugin/$plugin.php"); if(function_exists($plugin.'_plugin_admin')) { $func = $plugin.'_plugin_admin'; - $func($a, $admin_form); + $func($admin_form); } } |