diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-07-16 19:40:22 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-08-29 10:22:21 +0200 |
| commit | f551917a3ca2cedf748337646ed4b1d398ac8437 (patch) | |
| tree | eccf53eb77c44019ef59e90c41af43297993ddf9 /lib/private/appframework/dependencyinjection/dicontainer.php | |
| parent | ed2424c3822a3470065788ff113a3807d24d80dc (diff) | |
| download | nextcloud-server-f551917a3ca2cedf748337646ed4b1d398ac8437.tar.gz nextcloud-server-f551917a3ca2cedf748337646ed4b1d398ac8437.zip | |
kill OC::$session
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
Diffstat (limited to 'lib/private/appframework/dependencyinjection/dicontainer.php')
| -rw-r--r-- | lib/private/appframework/dependencyinjection/dicontainer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 61a2333ecee..e7efa3fa219 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -191,7 +191,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ } private function getUserId() { - return \OC::$session->get('user_id'); + return \OC::$server->getSession()->get('user_id'); } /** |