diff options
| author | M. Dent <dentm42@gmail.com> | 2019-02-15 22:03:33 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-02-15 22:03:33 +0100 |
| commit | a5b7590d3a12ba1c8469c6840d4a9f895787ed2e (patch) | |
| tree | 8f8b88c96d97d8d691ae383b92de21e607278a60 /Zotlabs | |
| parent | f0955f1620d783de30c43072e2fb987977b42d57 (diff) | |
| parent | ca917f7b9ae3f47f7159179f34fe769fb4665e5f (diff) | |
| download | volse-hubzilla-a5b7590d3a12ba1c8469c6840d4a9f895787ed2e.tar.gz volse-hubzilla-a5b7590d3a12ba1c8469c6840d4a9f895787ed2e.tar.bz2 volse-hubzilla-a5b7590d3a12ba1c8469c6840d4a9f895787ed2e.zip | |
Merge branch 'exclude_addon_common' into 'dev'
exclude addon_common from addon list
See merge request hubzilla/core!1513
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Admin/Addons.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php index b35922aef..b8e3e3a2e 100644 --- a/Zotlabs/Module/Admin/Addons.php +++ b/Zotlabs/Module/Admin/Addons.php @@ -375,6 +375,9 @@ class Addons { if($files) { foreach($files as $file) { if (is_dir($file)){ + if($file == 'addon/addon_common/') + continue; + list($tmp, $id) = array_map('trim', explode('/', $file)); $info = get_plugin_info($id); $enabled = in_array($id,\App::$plugins); @@ -476,4 +479,4 @@ class Addons { return(strcmp(strtolower($a[2]['name']),strtolower($b[2]['name']))); } -}
\ No newline at end of file +} |