summaryrefslogtreecommitdiffstats
path: root/lib/private/util.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-10-28 11:15:58 +0100
committerLukas Reschke <lukas@owncloud.com>2014-10-28 11:15:58 +0100
commit510d0b2cf3c108447f42fcb119560175134fb0f6 (patch)
treee5fa478087f35655f5857ebefb5c4ba576503697 /lib/private/util.php
parent7466ff09bb1b02de45b62a622ce51e4f680f2658 (diff)
downloadnextcloud-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 'lib/private/util.php')
-rw-r--r--lib/private/util.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 6cd982c222e..b949406690e 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -370,13 +370,13 @@ class OC_Util {
/**
* Add a custom element to the header
- *
+ * If $text is null then the element will be written as empty element.
+ * So use "" to get a closing tag.
* @param string $tag tag name of the element
* @param array $attributes array of attributes for the element
* @param string $text the text content for the element
- * @return void
*/
- public static function addHeader($tag, $attributes, $text = '') {
+ public static function addHeader($tag, $attributes, $text=null) {
self::$headers[] = array(
'tag' => $tag,
'attributes' => $attributes,