Merge pull request #9914 from owncloud/fix-appframework-blank-template

Fix template rendering for 'blank' templates
owncloud · Jul 30, 2014 · 7d6221d · 7d6221d
2 parents 47e7291 + 889088f
commit 7d6221d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
@@ -134,8 +134,10 @@ public function getRenderAs(){
 	 * @return string the rendered html
 	 */
 	public function render(){
+		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
+		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
 
-		$template = new \OCP\Template($this->appName, $this->templateName, $this->renderAs);
+		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
 
 		foreach($this->params as $key => $value){
 			$template->assign($key, $value);