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

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

3 files changed, 28 insertions, 11 deletions

diff --git a/lib/private/template.php b/lib/private/template.php
index fe0cde53ff1..9ad9d5466db 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -158,10 +158,15 @@ class OC_Template extends \OC\Template\Base {
 	 * Add a custom element to the header
 	 * @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
+	 * @param string $text the text content for the element. If $text is null then the
+	 * element will be written as empty element. So use "" to get a closing tag.
 	 */
-	public function addHeader( $tag, $attributes, $text='') {
-		$this->headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text);
+	public function addHeader($tag, $attributes, $text=null) {
+		$this->headers[]= array(
+			'tag' => $tag,
+			'attributes' => $attributes,
+			'text' => $text
+		);
 	}
 
 	/**
@@ -178,12 +183,22 @@ class OC_Template extends \OC\Template\Base {
 			$page = new OC_TemplateLayout($this->renderas, $this->app);
 
 			// Add custom headers
-			$page->assign('headers', $this->headers, false);
+			$headers = '';
 			foreach(OC_Util::$headers as $header) {
-				$page->append('headers', $header);
+				$headers .= '<'.OC_Util::sanitizeHTML($header['tag']);
+				foreach($header['attributes'] as $name=>$value) {
+					$headers .= ' "'.OC_Util::sanitizeHTML($name).'"="'.OC_Util::sanitizeHTML($value).'"';
+				}
+				if ($header['text'] !== null) {
+					$headers .= '>'.OC_Util::sanitizeHTML($header['text']).'</'.OC_Util::sanitizeHTML($header['tag']).'>';
+				} else {
+					$headers .= '/>';
+				}
 			}
 
-			$page->assign( "content", $data, false );
+			$page->assign('headers', $headers, false);
+
+			$page->assign('content', $data, false );
 			return $page->fetchPage();
 		}
 		else{
diff --git a/lib/private/util.php b/lib/private/util.php
index 9b8a7a5bc40..de4bef4cb8a 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -388,13 +388,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,
diff --git a/lib/public/util.php b/lib/public/util.php
index 22ded1d0fc5..a87d26a4004 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -147,12 +147,14 @@ class 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
 	 */
-	public static function addHeader( $tag, $attributes, $text='') {
-		\OC_Util::addHeader( $tag, $attributes, $text );
+	public static function addHeader($tag, $attributes, $text=null) {
+		\OC_Util::addHeader($tag, $attributes, $text);
 	}
 
 	/**