diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-29 21:47:39 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-29 21:47:39 +0200 |
| commit | 6506357210b668cb5c3d32319e46877f0a13c090 (patch) | |
| tree | 803ab4b6706736125e001b06c247ea48a837fcc6 | |
| parent | 883888bdc6cfca5675afe0b547fdfa5c84560a81 (diff) | |
| parent | 2fa432dfb8ce8267c719f4b4685a4ccc050160f5 (diff) | |
| download | nextcloud-server-6506357210b668cb5c3d32319e46877f0a13c090.tar.gz nextcloud-server-6506357210b668cb5c3d32319e46877f0a13c090.zip | |
Merge pull request #17239 from owncloud/files-nameconflictfix
Fix class name conflict
| -rw-r--r-- | lib/private/connector/sabre/maintenanceplugin.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php index 634e5a68128..5b48abbc517 100644 --- a/lib/private/connector/sabre/maintenanceplugin.php +++ b/lib/private/connector/sabre/maintenanceplugin.php @@ -27,7 +27,6 @@ namespace OC\Connector\Sabre; use OCP\IConfig; use Sabre\DAV\Exception\ServiceUnavailable; -use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; class MaintenancePlugin extends ServerPlugin { @@ -61,10 +60,10 @@ class MaintenancePlugin extends ServerPlugin { * * This method should set up the required event subscriptions. * - * @param Server $server + * @param \Sabre\DAV\Server $server * @return void */ - public function initialize(Server $server) { + public function initialize(\Sabre\DAV\Server $server) { $this->server = $server; $this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 10); } |