Merge pull request #11015 from MrPetovan/task/10979-frio-time-tooltip

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

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 03f1dfd9cd45c0de6a9533fcde4458c2008e0058..5da067e73b7006b9c824ad4362a76c3161d9cc9c 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-2021, 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", System::callstack());
+               DI::profiler()->stopRecording();
 
                $result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
@@ -158,6 +158,8 @@ class Theme
                        if (function_exists($func)) {
                                $func();
                        }
+
+                       Hook::delete(['file' => "view/theme/$theme/theme.php"]);
                }
 
                $allowed_themes = Theme::getAllowedList();
@@ -212,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",
@@ -269,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";