summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-10-30 18:13:46 +0100
committerVincent Petry <pvince81@owncloud.com>2014-10-30 18:13:46 +0100
commitbed81ea854119b1f48d39a5da3381c3eb968838a (patch)
tree43fb50cf3d5a8a4299824fd638ceb747cec8d5a0 /core
parent146c46b73a5b780fafd400dfa1881c14457cb4a2 (diff)
parent510d0b2cf3c108447f42fcb119560175134fb0f6 (diff)
downloadnextcloud-server-bed81ea854119b1f48d39a5da3381c3eb968838a.tar.gz
nextcloud-server-bed81ea854119b1f48d39a5da3381c3eb968838a.zip
Merge pull request #11080 from owncloud/addheader-text-2
Fix the addHeader tag attributes text methods to not ignore the text parameter
Diffstat (limited to 'core')
-rw-r--r--core/templates/layout.base.php10
-rw-r--r--core/templates/layout.guest.php11
-rw-r--r--core/templates/layout.user.php10
3 files changed, 3 insertions, 28 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 3325bc9165e..2b496c23246 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -21,15 +21,7 @@
<?php foreach ($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
<?php endforeach; ?>
- <?php foreach ($_['headers'] as $header): ?>
- <?php
- print_unescaped('<'.$header['tag'].' ');
- foreach ($header['attributes'] as $name => $value) {
- print_unescaped("$name='$value' ");
- };
- print_unescaped('/>');
- ?>
- <?php endforeach; ?>
+ <?php print_unescaped($_['headers']); ?>
</head>
<body id="body-public">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 0ad2ea4d807..763af4dc1d2 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -22,16 +22,7 @@
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
<?php endforeach; ?>
-
- <?php foreach($_['headers'] as $header): ?>
- <?php
- print_unescaped('<'.$header['tag'].' ');
- foreach($header['attributes'] as $name=>$value) {
- print_unescaped("$name='$value' ");
- };
- print_unescaped('/>');
- ?>
- <?php endforeach; ?>
+ <?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 6164d16ac17..9f94344b21b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -29,15 +29,7 @@
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
<?php endforeach; ?>
- <?php foreach($_['headers'] as $header): ?>
- <?php
- print_unescaped('<'.$header['tag'].' ');
- foreach($header['attributes'] as $name=>$value) {
- print_unescaped("$name='$value' ");
- };
- print_unescaped('/>');
- ?>
- <?php endforeach; ?>
+ <?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>