Merge pull request #9576 from MrPetovan/bug/9573-addon-install

Don't assume addons must have an *_install function

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 8b95af328c26dd46cd05b08faedb77b268ea9436..511364b8acb0cff9bb6180e97d6dd8441bea288b 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -163,29 +163,21 @@ class Addon
                if (function_exists($addon . '_install')) {
                        $func = $addon . '_install';
                        $func(DI::app());
+               }
 
-                       $addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
-
-                       DBA::insert('addon', ['name' => $addon, 'installed' => true,
-                               'timestamp' => $t, 'plugin_admin' => $addon_admin]);
-
-                       // we can add the following with the previous SQL
-                       // once most site tables have been updated.
-                       // This way the system won't fall over dead during the update.
-
-                       if (file_exists('addon/' . $addon . '/.hidden')) {
-                               DBA::update('addon', ['hidden' => true], ['name' => $addon]);
-                       }
-
-                       if (!self::isEnabled($addon)) {
-                               self::$addons[] = $addon;
-                       }
-
-                       return true;
-               } else {
-                       Logger::error("Addon {addon}: {action} failed", ['action' => 'install', 'addon' => $addon]);
-                       return false;
+               DBA::insert('addon', [
+                       'name' => $addon,
+                       'installed' => true,
+                       'timestamp' => $t,
+                       'plugin_admin' => function_exists($addon . '_addon_admin'),
+                       'hidden' => file_exists('addon/' . $addon . '/.hidden')
+               ]);
+
+               if (!self::isEnabled($addon)) {
+                       self::$addons[] = $addon;
                }
+
+               return true;
        }
 
        /**