X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FTheme.php;h=5da067e73b7006b9c824ad4362a76c3161d9cc9c;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=c17c67c4d935b8a52bafd7b19c259de2e7b2aca0;hpb=1a8110234f1ff6ad5ea8c5f829e0639ef8b2d2c6;p=friendica.git

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index c17c67c4d9..5da067e73b 100644
--- 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);
 
@@ -98,7 +98,7 @@ class Theme
 			$comment_lines = explode("\n", $matches[0]);
 			foreach ($comment_lines as $comment_line) {
 				$comment_line = trim($comment_line, "\t\n\r */");
-				if ($comment_line != "") {
+				if (strpos($comment_line, ':') !== false) {
 					list($key, $value) = array_map("trim", explode(":", $comment_line, 2));
 					$key = strtolower($key);
 					if ($key == "author") {
@@ -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";