diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-10-28 11:15:58 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-10-28 11:15:58 +0100 |
| commit | 510d0b2cf3c108447f42fcb119560175134fb0f6 (patch) | |
| tree | e5fa478087f35655f5857ebefb5c4ba576503697 /core/templates | |
| parent | 7466ff09bb1b02de45b62a622ce51e4f680f2658 (diff) | |
| download | nextcloud-server-510d0b2cf3c108447f42fcb119560175134fb0f6.tar.gz nextcloud-server-510d0b2cf3c108447f42fcb119560175134fb0f6.zip | |
Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter
Also support closing tags with no text content given
Conflicts:
lib/private/template.php
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.base.php | 10 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 11 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 10 |
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> |