Merge pull request #11520 from annando/display-polls

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

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 334f31a6e55f1f72c60f33ae72f92ba082b92c7b..57dfaa4d634ca5522493d5c4d1055e4b6ed603bd 100644 (file)
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -88,9 +88,9 @@ class Theme
                        return $info;
                }
 
-               $stamp1 = microtime(true);
+               DI::profiler()->startRecording('file');
                $theme_file = file_get_contents("view/theme/$theme/theme.php");
-               DI::profiler()->saveTimestamp($stamp1, "file");
+               DI::profiler()->stopRecording();
 
                $result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
@@ -214,7 +214,7 @@ class Theme
 
                $theme = $a->getCurrentTheme();
 
-               $parent = Strings::sanitizeFilePathItem($a->theme_info['extends'] ?? $theme);
+               $parent = Strings::sanitizeFilePathItem($a->getThemeInfoValue('extends', $theme));
 
                $paths = [
                        "view/theme/$theme/$file",
@@ -271,7 +271,7 @@ class Theme
                $theme = Strings::sanitizeFilePathItem($theme);
 
                $a = DI::app();
-               $base_theme = $a->theme_info['extends'] ?? '';
+               $base_theme = $a->getThemeInfoValue('extends') ?? '';
 
                if (file_exists("view/theme/$theme/config.php")) {
                        return "view/theme/$theme/config.php";