mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass template parameters to parent template 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-01-25 19:14:27 +01:00 committed by Roeland Jago Douma
parent d0a6368a8b
commit 0655df09d6
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/legacy/template.php
View File

@ -206,6 +206,12 @@ class OC_Template extends \OC\Template\Base {
if( $this->renderAs ) {
$page = new TemplateLayout($this->renderAs, $this->app);
if(is_array($additionalParams)) {
foreach ($additionalParams as $key => $value) {
$page->assign($key, $value);
}
}
// Add custom headers
$headers = '';
foreach(OC_Util::$headers as $header) {
@ -226,7 +232,7 @@ class OC_Template extends \OC\Template\Base {
$page->assign('headers', $headers);
$page->assign('content', $data);
return $page->fetchPage();
return $page->fetchPage($additionalParams);
}
return $data;

2
lib/public/AppFramework/Http/TemplateResponse.php
View File

@ -154,7 +154,7 @@ class TemplateResponse extends Response {
$template->assign($key, $value);
}
return $template->fetchPage();
return $template->fetchPage($this->params);
}
}