Remove duplicate profile_uid key in App->profile array

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index b1c1ad2e606808c2fc3c8349bada54d241bed7d4..5f1865b554898608aff5616a3c0539660417587b 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -5,7 +5,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
@@ -13,7 +12,7 @@ use Friendica\Util\Strings;
 /**
  * Some functions to handle addons
  */
-class Addon extends BaseObject
+class Addon
 {
        /**
         * The addon sub-directory
@@ -46,7 +45,7 @@ class Addon extends BaseObject
                                        list($tmp, $addon) = array_map('trim', explode('/', $file));
                                        $info = self::getInfo($addon);
 
-                                       if (Config::get('system', 'show_unsupported_addons')
+                                       if (DI::config()->get('system', 'show_unsupported_addons')
                                                || strtolower($info['status']) != 'unsupported'
                                                || self::isEnabled($addon)
                                        ) {
@@ -84,7 +83,7 @@ class Addon extends BaseObject
 
 
        /**
-        * @brief Synchronize addons:
+        * Synchronize addons:
         *
         * system.addon contains a comma-separated list of names
         * of addons which are used on this system.
@@ -104,7 +103,7 @@ class Addon extends BaseObject
                        $installed_addons = DBA::toArray($r);
                }
 
-               $addons = Config::get('system', 'addon');
+               $addons = DI::config()->get('system', 'addon');
                $addons_arr = [];
 
                if ($addons) {
@@ -131,7 +130,7 @@ class Addon extends BaseObject
        }
 
        /**
-        * @brief uninstalls an addon.
+        * uninstalls an addon.
         *
         * @param string $addon name of the addon
         * @return void
@@ -158,7 +157,7 @@ class Addon extends BaseObject
        }
 
        /**
-        * @brief installs an addon.
+        * installs an addon.
         *
         * @param string $addon name of the addon
         * @return bool
@@ -211,7 +210,7 @@ class Addon extends BaseObject
         */
        public static function reload()
        {
-               $addons = Config::get('system', 'addon');
+               $addons = DI::config()->get('system', 'addon');
                if (strlen($addons)) {
                        $r = DBA::select('addon', [], ['installed' => 1]);
                        if (DBA::isResult($r)) {
@@ -250,7 +249,7 @@ class Addon extends BaseObject
        }
 
        /**
-        * @brief Parse addon comment in search of addon infos.
+        * Parse addon comment in search of addon infos.
         *
         * like
         * \code
@@ -287,7 +286,7 @@ class Addon extends BaseObject
 
                $stamp1 = microtime(true);
                $f = file_get_contents("addon/$addon/$addon.php");
-               $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
 
                $r = preg_match("|/\*.*\*/|msU", $f, $m);
 
@@ -349,7 +348,7 @@ class Addon extends BaseObject
         */
        public static function saveEnabledList()
        {
-               return Config::set('system', 'addon', implode(',', self::$addons));
+               return DI::config()->set('system', 'addon', implode(',', self::$addons));
        }
 
        /**