summaryrefslogtreecommitdiffstats
path: root/lib/private/template.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-01-25 17:15:54 +0100
committerLukas Reschke <lukas@owncloud.com>2016-01-25 20:03:40 +0100
commita977465af5834a76b1e98854a2c9bfbe413c218c (patch)
tree7a47d606f7935ac7de09fe8169188691cc9e4373 /lib/private/template.php
parent37f5f5077a59d69723965d1345536d46605589f5 (diff)
downloadnextcloud-server-a977465af5834a76b1e98854a2c9bfbe413c218c.tar.gz
nextcloud-server-a977465af5834a76b1e98854a2c9bfbe413c218c.zip
Add new CSRF manager for unit testing purposes
This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf. Due to some of our required custom changes it is however not possible to use the Symfony component directly.
Diffstat (limited to 'lib/private/template.php')
-rw-r--r--lib/private/template.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/template.php b/lib/private/template.php
index 717f91a7034..ae3e857a798 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -76,7 +76,7 @@ class OC_Template extends \OC\Template\Base {
$theme = OC_Util::getTheme();
- $requesttoken = (OC::$server->getSession() and $registerCall) ? OC_Util::callRegister() : '';
+ $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
$l10n = \OC::$server->getL10N($parts[0]);
@@ -89,7 +89,7 @@ class OC_Template extends \OC\Template\Base {
$this->path = $path;
$this->app = $app;
- parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
+ parent::__construct($template, $requestToken, $l10n, $themeDefaults);
}
public static function initTemplateEngine($renderAs) {