diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-02-19 12:15:59 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-02-19 12:15:59 +0100 |
| commit | c5bb0745737432c6d27e9468e56ad0bd33698462 (patch) | |
| tree | 7d6b7a364941b9325ea319e6564e9f6123f059f2 /Zotlabs/Module/Admin | |
| parent | 4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0 (diff) | |
| parent | cead10b9af6ff9d8b1bc702ca21d27af7c2112f0 (diff) | |
| download | volse-hubzilla-c5bb0745737432c6d27e9468e56ad0bd33698462.tar.gz volse-hubzilla-c5bb0745737432c6d27e9468e56ad0bd33698462.tar.bz2 volse-hubzilla-c5bb0745737432c6d27e9468e56ad0bd33698462.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Admin')
| -rw-r--r-- | Zotlabs/Module/Admin/Addons.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 2 |
2 files changed, 5 insertions, 2 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 +} diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 09b038729..55c8ca928 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -119,7 +119,7 @@ class Site { del_config('system', 'admininfo'); } else { require_once('include/text.php'); - linkify_tags($a, $admininfo, local_channel()); + linkify_tags($admininfo, local_channel()); set_config('system', 'admininfo', $admininfo); } set_config('system','siteinfo',$siteinfo); |