Remove duplicate profile_uid key in App->profile array

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

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 4f870687ce0d08e577a3459589ce07ac139576da..76149b7589acae9fc829a2f984b41bb550d8e507 100644 (file)
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -6,7 +6,7 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 
@@ -19,7 +19,7 @@ class Theme
 {
        public static function getAllowedList()
        {
-               $allowed_themes_str = Config::get('system', 'allowed_themes');
+               $allowed_themes_str = DI::config()->get('system', 'allowed_themes');
                $allowed_themes_raw = explode(',', str_replace(' ', '', $allowed_themes_str));
                $allowed_themes = [];
                if (count($allowed_themes_raw)) {
@@ -36,11 +36,11 @@ class Theme
 
        public static function setAllowedList(array $allowed_themes)
        {
-               Config::set('system', 'allowed_themes', implode(',', array_unique($allowed_themes)));
+               DI::config()->set('system', 'allowed_themes', implode(',', array_unique($allowed_themes)));
        }
 
        /**
-        * @brief Parse theme comment in search of theme infos.
+        * Parse theme comment in search of theme infos.
         *
         * like
         * \code
@@ -73,10 +73,9 @@ class Theme
                        return $info;
                }
 
-               $a = \get_app();
                $stamp1 = microtime(true);
                $theme_file = file_get_contents("view/theme/$theme/theme.php");
-               $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
 
                $result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
@@ -111,7 +110,7 @@ class Theme
        }
 
        /**
-        * @brief Returns the theme's screenshot.
+        * Returns the theme's screenshot.
         *
         * The screenshot is expected as view/theme/$theme/screenshot.[png|jpg].
         *
@@ -126,10 +125,10 @@ class Theme
                $exts = ['.png', '.jpg'];
                foreach ($exts as $ext) {
                        if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
-                               return System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext;
+                               return DI::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext;
                        }
                }
-               return System::baseUrl() . '/images/blank.png';
+               return DI::baseUrl() . '/images/blank.png';
        }
 
        public static function uninstall($theme)
@@ -183,7 +182,7 @@ class Theme
        }
 
        /**
-        * @brief Get the full path to relevant theme files by filename
+        * Get the full path to relevant theme files by filename
         *
         * This function searches in order in the current theme directory, in the current theme parent directory, and lastly
         * in the base view/ folder.
@@ -194,7 +193,7 @@ class Theme
         */
        public static function getPathForFile($file)
        {
-               $a = BaseObject::getApp();
+               $a = DI::app();
 
                $theme = $a->getCurrentTheme();
 
@@ -216,7 +215,7 @@ class Theme
        }
 
        /**
-        * @brief Return relative path to theme stylesheet file
+        * Return relative path to theme stylesheet file
         *
         * Provide a sane default if nothing is chosen or the specified theme does not exist.
         *
@@ -232,7 +231,7 @@ class Theme
                        return 'view/theme/' . $theme . '/style.css';
                }
 
-               $a = BaseObject::getApp();
+               $a = DI::app();
 
                $query_params = [];