diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index c113a4db24e0570e39ec6b8354ae0eb2b1c62f5b..f78b6ff8bbd47eb0f815d771eb3264900b0a295c 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -10,6 +10,8 @@ <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; + 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/core/templates/layout.guest.php b/core/templates/layout.guest.php index 0d2e71c180f24b6f25bfbcb6f18ed7982c157746..6f59e18a8e1bc9509435dd45fa47d08911fe6b2d 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -10,6 +10,8 @@ <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; + 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 681b3f0b1404f727debb1c5a766dc9e8326d896e..fb81ec62519c8c9d0e5fdaaa02a61f3621dde898 100644 --- a/lib/template.php +++ b/lib/template.php @@ -155,10 +155,8 @@ 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; - } + $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');