diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-10-24 21:55:25 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-10-24 21:55:25 +0200 |
| commit | 675a56c5ed798afae6bc9e56616f948a2c4496c2 (patch) | |
| tree | 53f8b9688d4ace289d8b5438e22fa3d857e3aa5b /core/ajax | |
| parent | befdd6b63b1f64625bd26d50b18ebef5b8f82db4 (diff) | |
| parent | 515e1b467e58337067ee3a4a8945f449d3c2ef3a (diff) | |
| download | nextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.tar.gz nextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'core/ajax')
| -rw-r--r-- | core/ajax/requesttoken.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php index 96d5402e621..705330b2c3e 100644 --- a/core/ajax/requesttoken.php +++ b/core/ajax/requesttoken.php @@ -29,8 +29,8 @@ require_once '../../lib/base.php'; // don't load apps or filesystem for this task -$RUNTIME_NOAPPS = TRUE; -$RUNTIME_NOSETUPFS = TRUE; +$RUNTIME_NOAPPS = true; +$RUNTIME_NOSETUPFS = true; // Sanity checks // using OCP\JSON::callCheck() below protects the token refreshing itself. |