diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
| commit | ae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch) | |
| tree | f483759739cd951c33ef1c61ade8694f9e1c95e3 /lib/public/files/locknotacquiredexception.php | |
| parent | 3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff) | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| download | nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip | |
Merge branch 'master' into securityutils
Conflicts:
lib/private/util.php
Diffstat (limited to 'lib/public/files/locknotacquiredexception.php')
| -rw-r--r-- | lib/public/files/locknotacquiredexception.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public/files/locknotacquiredexception.php b/lib/public/files/locknotacquiredexception.php index 9fb70e7cbe2..647b07bf878 100644 --- a/lib/public/files/locknotacquiredexception.php +++ b/lib/public/files/locknotacquiredexception.php @@ -36,7 +36,7 @@ class LockNotAcquiredException extends \Exception { public $lockType; public function __construct($path, $lockType, $code = 0, \Exception $previous = null) { - $message = \OC_L10N::get('core')->t('Could not obtain lock type %d on "%s".', array($lockType, $path)); + $message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', array($lockType, $path)); parent::__construct($message, $code, $previous); } @@ -44,4 +44,4 @@ class LockNotAcquiredException extends \Exception { public function __toString() { return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; } -}
\ No newline at end of file +} |