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

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

diff --cc lib/private/util.php
Simple merge

diff --cc lib/public/util.php
index 22ded1d0fc5f9f592834fe212cd09240b7f935a2,e40fdcfae795bb75c6d67ceba9aeb2722eae1919..a87d26a40042e4b1d7ac78869d788e9c236bec2e
--- 1/lib/public/util.php
--- 2/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