Merge pull request #50766 from nextcloud/backport/50081/stable31

[stable31] fix(core): Fix undefined "application" array key error
nextcloud · Feb 12, 2025 · 77ccb71 · 77ccb71
2 parents 1162b63 + 74d2601
commit 77ccb71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
@@ -10,7 +10,7 @@
 	<meta charset="utf-8">
 	<title>
 	<?php
-				p(!empty($_['pageTitle']) && $_['pageTitle'] !== $_['application'] ? $_['pageTitle'] . ' - ' : '');
+				p(!empty($_['pageTitle']) && (empty($_['application']) || $_['pageTitle'] !== $_['application']) ? $_['pageTitle'] . ' - ' : '');
 p(!empty($_['application']) ? $_['application'] . ' - ' : '');
 p($theme->getTitle());
 ?>

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
@@ -24,7 +24,7 @@
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['pageTitle']) && $_['pageTitle'] !== $_['application'] ? $_['pageTitle'] . ' - ' : '');
+				p(!empty($_['pageTitle']) && (empty($_['application']) || $_['pageTitle'] !== $_['application']) ? $_['pageTitle'] . ' - ' : '');
 p(!empty($_['application']) ? $_['application'] . ' - ' : '');
 p($theme->getTitle());
 ?>