diff options
| author | ringmaster <epithet@gmail.com> | 2014-05-30 08:10:48 -0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-04 07:55:45 +0200 |
| commit | cda87fd9c4e9d60bb20a9e4b80db5951dccc00e2 (patch) | |
| tree | 8770ed247645e5e1c458e73cb64e2fb84fbca5a6 /lib | |
| parent | e6712bc12e6e57fd656a64f870243ee2aff4f10c (diff) | |
| download | nextcloud-server-cda87fd9c4e9d60bb20a9e4b80db5951dccc00e2.tar.gz nextcloud-server-cda87fd9c4e9d60bb20a9e4b80db5951dccc00e2.zip | |
Normalize lock exception messages.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/connector/sabre/exception/filelocked.php | 2 | ||||
| -rw-r--r-- | lib/private/connector/sabre/file.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/exception/filelocked.php b/lib/private/connector/sabre/exception/filelocked.php index 4bad936bd9f..ec200f847e3 100644 --- a/lib/private/connector/sabre/exception/filelocked.php +++ b/lib/private/connector/sabre/exception/filelocked.php @@ -11,7 +11,7 @@ class OC_Connector_Sabre_Exception_FileLocked extends Sabre_DAV_Exception { public function __construct($message = "", $code = 0, Exception $previous = null) { if($previous instanceof \OCP\Files\LockNotAcquiredException) { - $message = sprintf('Target file %s is locked by another process. %s', $previous->path, $previous->getMessage()); + $message = sprintf('Target file %s is locked by another process.', $previous->path); } parent::__construct($message, $code, $previous); } diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index fc57c82624e..48287b1e503 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -99,7 +99,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D throw new Sabre_DAV_Exception_Forbidden($e->getMessage()); } catch (\OCP\Files\LockNotAcquiredException $e) { // the file is currently being written to by another process - throw new OC_Connector_Sabre_Exception_FileLocked(sprintf('Target file %s is locked by another process. %s', $e->path, $e->getMessage()), $e->getCode(), $e); + throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e); } // rename to correct path |