diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-09-08 21:15:08 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-09-09 12:48:08 +0200 |
| commit | bfa26db4727cf5cf9a26754b82e65a38ffc98bbd (patch) | |
| tree | 214038fefcb88ae4d91add85e129a35f288cfdb6 /lib | |
| parent | c4c9c5ffad9a67c6f0b19a567ac99aa6e97840de (diff) | |
| download | nextcloud-server-bfa26db4727cf5cf9a26754b82e65a38ffc98bbd.tar.gz nextcloud-server-bfa26db4727cf5cf9a26754b82e65a38ffc98bbd.zip | |
Use md5 over the version file to prevent cyclyc dependency
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/server.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 393c1840973..346761840d6 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -177,8 +177,6 @@ class Server extends SimpleContainer implements IServerContainer { $manager = $c->getUserManager(); $session = new \OC\Session\Memory(''); - $cryptoWrapper = $c->getSessionCryptoWrapper(); - $session = $cryptoWrapper->wrapSession($session); $userSession = new \OC\User\Session($manager, $session); $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { @@ -252,7 +250,7 @@ class Server extends SimpleContainer implements IServerContainer { if($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { $v = \OC_App::getAppVersions(); - $v['core'] = implode('.', \OC_Util::getVersion()); + $v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php')); $version = implode(',', $v); $instanceId = \OC_Util::getInstanceId(); $path = \OC::$SERVERROOT; |