summaryrefslogtreecommitdiffstats
path: root/lib/public/appframework
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-07-26 00:04:49 +0200
committerRobin Appelman <icewind@owncloud.com>2014-07-29 16:49:50 +0200
commit889088f72da5aa3ce10f2f6c43bb66d00f5a1423 (patch)
treefac9cc73bcfff178899864e9227963f15058e0c8 /lib/public/appframework
parent2946a63f6bbcf298a30bb89ed72dbb650bc39def (diff)
downloadnextcloud-server-889088f72da5aa3ce10f2f6c43bb66d00f5a1423.tar.gz
nextcloud-server-889088f72da5aa3ce10f2f6c43bb66d00f5a1423.zip
Fix template rendering for 'blank' templates
Diffstat (limited to 'lib/public/appframework')
-rw-r--r--lib/public/appframework/http/templateresponse.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
index 02589f4e2a4..c74d3b60254 100644
--- a/lib/public/appframework/http/templateresponse.php
+++ b/lib/public/appframework/http/templateresponse.php
@@ -134,8 +134,10 @@ class TemplateResponse extends Response {
* @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);