diff options
| -rw-r--r-- | core/templates/layout.user.php | 4 | ||||
| -rw-r--r-- | lib/template.php | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 25af64c8d57..b6d8a7604a2 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -11,8 +11,8 @@ var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_current_user = '<?php echo OC_User::getUser() ?>'; - var oc_requesttoken = '<?php echo OC_Util::callRegister(); ?>'; - var oc_requestlifespan = '<?php echo OC_Util::$callLifespan; ?>'; + var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; + var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/lib/template.php b/lib/template.php index 0033683b66f..681b3f0b140 100644 --- a/lib/template.php +++ b/lib/template.php @@ -155,6 +155,10 @@ class OC_Template{ $this->renderas = $renderas; $this->application = $app; $this->vars = array(); + if($renderas == 'user') { + $this->vars['requesttoken'] = OC_Util::callRegister(); + $this->vars['requestlifespan'] = OC_Util::$callLifespan; + } $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $this->l10n = OC_L10N::get($parts[0]); header('X-Frame-Options: Sameorigin'); @@ -369,6 +373,10 @@ class OC_Template{ if( $this->renderas ) { $page = new OC_TemplateLayout($this->renderas); + if($this->renderas == 'user') { + $page->assign('requesttoken', $this->vars['requesttoken']); + $page->assign('requestlifespan', $this->vars['requestlifespan']); + } // Add custom headers $page->assign('headers',$this->headers, false); |