Merge pull request #35273 from owncloud/backport-30882

micbar · web-flow · commit 256c2a53e414 · 2019-05-24T15:29:00.000+02:00
[Stable10] allow html in claim and use htmlname in layout
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
@@ -37,10 +37,10 @@
 						<div id="header">
 							<div class="logo">
 								<h1 class="hidden-visually">
-									<?php p($theme->getName()); ?>
+									<?php print_unescaped($theme->getHTMLName()); ?>
 								</h1>
 							</div>
-							<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
+							<div id="logo-claim" style="display:none;"><?php print_unescaped($theme->getLogoClaim()); ?></div>
 						</div>
 					</header>
 				<?php endif; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
@@ -45,7 +45,7 @@
 			<div id="header">
 				<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" id="owncloud" tabindex="1">
 					<h1 class="logo-icon">
-						<?php p($theme->getName()); ?>
+						<?php print_unescaped($theme->getHTMLName()); ?>
 					</h1>
 				</a>
 				<a href="#" class="header-appname-container menutoggle" tabindex="2">
@@ -56,7 +56,7 @@
 						<?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
 					</h1>
 				</a>
-				<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
+				<div id="logo-claim" style="display:none;"><?php print_unescaped($theme->getLogoClaim()); ?></div>
 				<div id="settings">
 					<div id="expand" tabindex="6" role="link" class="menutoggle">
 						<?php if ($_['enableAvatars']): ?>
