X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FTheme.php;h=6f0d9d43603a54e683ffbf7f3b6fb1b053069d19;hb=3f3422975266835fc125d1d61aae85ccc10d96d9;hp=7a59f11325cd6ef6730e9ffdd41335050549520d;hpb=2f2480d88d6e89356f4a0f1c50060622e8a25e49;p=friendica.git

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 7a59f11325..6f0d9d4360 100644
--- 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;
 
@@ -31,12 +31,12 @@ class Theme
 			}
 		}
 
-		return $allowed_themes;
+		return array_unique($allowed_themes);
 	}
 
 	public static function setAllowedList(array $allowed_themes)
 	{
-		Config::set('system', 'allowed_themes', implode(',', $allowed_themes));
+		Config::set('system', 'allowed_themes', implode(',', array_unique($allowed_themes)));
 	}
 
 	/**
@@ -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);
 
@@ -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)
@@ -194,7 +193,7 @@ class Theme
 	 */
 	public static function getPathForFile($file)
 	{
-		$a = BaseObject::getApp();
+		$a = DI::app();
 
 		$theme = $a->getCurrentTheme();
 
@@ -232,7 +231,7 @@ class Theme
 			return 'view/theme/' . $theme . '/style.css';
 		}
 
-		$a = BaseObject::getApp();
+		$a = DI::app();
 
 		$query_params = [];