summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-04-26 06:20:39 -0700
committerBart Visscher <bartv@thisnet.nl>2013-04-26 06:20:39 -0700
commit686f83673699c778f8f213cc525addc860990222 (patch)
tree709a41a6723ebf3ff053f6aae51e2d9d9e74568b
parent948e3d5b7c6d6611ff5df6905f94a2adaddb80af (diff)
parent172499d5f3be298e105139020a1afc9859841b31 (diff)
downloadnextcloud-server-686f83673699c778f8f213cc525addc860990222.tar.gz
nextcloud-server-686f83673699c778f8f213cc525addc860990222.zip
Merge pull request #3026 from owncloud/cli-no-session
Don't start the session when in cli mode
-rw-r--r--lib/base.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index 3b421486daf..8633ae9b637 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -478,7 +478,9 @@ class OC {
self::checkConfig();
self::checkInstalled();
self::checkSSL();
- self::initSession();
+ if ( !self::$CLI ) {
+ self::initSession();
+ }
$errors = OC_Util::checkServer();
if (count($errors) > 0) {