Merge pull request #9039 from MrPetovan/task/frio-accent-scheme

[friendica.git] / src / Core / Addon.php

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index dd229be287a83ebbb15466be1e401d00128ecba4..0462504e70a29d01457fa5a1d5ecf4fd56c011c5 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -136,7 +136,7 @@ class Addon
                        $func();
                }
 
-               DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']);
+               Hook::delete(['file' => 'addon/' . $addon . '/' . $addon . '.php']);
 
                unset(self::$addons[array_search($addon, self::$addons)]);
        }
@@ -204,17 +204,9 @@ class Addon
                        }
 
                        Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
-                       @include_once($fname);
 
-                       if (function_exists($addonname . '_uninstall')) {
-                               $func = $addonname . '_uninstall';
-                               $func(DI::app());
-                       }
-                       if (function_exists($addonname . '_install')) {
-                               $func = $addonname . '_install';
-                               $func(DI::app());
-                       }
-                       DBA::update('addon', ['timestamp' => $t], ['id' => $addon['id']]);
+                       self::uninstall($fname);
+                       self::install($fname);
                }
        }
 
@@ -256,7 +248,7 @@ class Addon
 
                $stamp1 = microtime(true);
                $f = file_get_contents("addon/$addon/$addon.php");
-               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file");
 
                $r = preg_match("|/\*.*\*/|msU", $f, $m);