diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-03 11:04:49 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-03 11:04:49 +0200 |
| commit | 77c0adb520adcb100d2ef4fd0562330b209ee9ea (patch) | |
| tree | 9bae923fa05f312c033722ad2c711cec01758ab0 /apps/files/ajax/upload.php | |
| parent | 50b430ee7cadd6be1520d63acdac27bc06581e09 (diff) | |
| parent | fe74b397a53b8a568c15d1ccf779bc8b0425b3c5 (diff) | |
| download | nextcloud-server-77c0adb520adcb100d2ef4fd0562330b209ee9ea.tar.gz nextcloud-server-77c0adb520adcb100d2ef4fd0562330b209ee9ea.zip | |
Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils
Diffstat (limited to 'apps/files/ajax/upload.php')
| -rw-r--r-- | apps/files/ajax/upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index b737d5f8710..b960e02ced7 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -10,7 +10,7 @@ OCP\JSON::setContentTypeHeader('text/plain'); $allowedPermissions = OCP\PERMISSION_ALL; $errorCode = null; -$l = OC_L10N::get('files'); +$l = \OC::$server->getL10N('files'); if (empty($_POST['dirToken'])) { // The standard case, files are uploaded through logged in users :) OCP\JSON::checkLoggedIn(); @@ -68,7 +68,7 @@ if (empty($_POST['dirToken'])) { OCP\JSON::callCheck(); if (!\OCP\App::isEnabled('files_encryption')) { // encryption app need to create keys later, so can't close too early - \OC::$session->close(); + \OC::$server->getSession()->close(); } |