From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 30 Oct 2014 17:13:46 +0000 (+0100)
Subject: Merge pull request #11080 from owncloud/addheader-text-2
X-Git-Tag: v8.0.0alpha1~408
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bed81ea854119b1f48d39a5da3381c3eb968838a;p=nextcloud-server.git

Merge pull request #11080 from owncloud/addheader-text-2

Fix the addHeader tag attributes text methods to not ignore the text parameter
---

bed81ea854119b1f48d39a5da3381c3eb968838a
diff --cc lib/public/util.php
index 22ded1d0fc5,e40fdcfae79..a87d26a4004
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@@ -136,17 -136,10 +136,19 @@@ class Util 
  		\OC_Util::addScript( $application, $file );
  	}
  
 +	/**
 +	 * Add a translation JS file
 +	 * @param string $application application id
 +	 * @param string $languageCode language code, defaults to the current locale
 +	 */
 +	public static function addTranslations($application, $languageCode = null) {
 +		\OC_Util::addTranslations($application, $languageCode);
 +	}
 +
  	/**
  	 * 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