summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-08-18 13:43:25 +0200
committerRobin Appelman <icewind@owncloud.com>2014-08-31 10:47:50 +0200
commitba8416a04fbeb292c00cb10c215bb03fe2f2628f (patch)
treea5fde56d7633afde4aa992ae6ed51f8d446e99b1 /lib
parentf135130a7524e0b035a721aa395a60117494f806 (diff)
downloadnextcloud-server-ba8416a04fbeb292c00cb10c215bb03fe2f2628f.tar.gz
nextcloud-server-ba8416a04fbeb292c00cb10c215bb03fe2f2628f.zip
move certificate classes to their own namespace
Diffstat (limited to 'lib')
-rw-r--r--lib/private/certificate/certificate.php (renamed from lib/private/certificate.php)4
-rw-r--r--lib/private/certificate/certificatemanager.php (renamed from lib/private/certificatemanager.php)2
-rw-r--r--lib/private/server.php1
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/certificate.php b/lib/private/certificate/certificate.php
index 294722bc660..801afa79167 100644
--- a/lib/private/certificate.php
+++ b/lib/private/certificate/certificate.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OC;
+namespace OC\Certificate;
use OCP\ICertificate;
@@ -75,7 +75,7 @@ class Certificate implements ICertificate {
* @return string
*/
public function getSerial() {
- return $this->getSerial();
+ return $this->serial;
}
/**
diff --git a/lib/private/certificatemanager.php b/lib/private/certificate/certificatemanager.php
index 90a30182c65..c6207f057dc 100644
--- a/lib/private/certificatemanager.php
+++ b/lib/private/certificate/certificatemanager.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OC;
+namespace OC\Certificate;
use OCP\ICertificateManager;
diff --git a/lib/private/server.php b/lib/private/server.php
index a30571c1e13..311001ce407 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,6 +6,7 @@ use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
use OC\Cache\UserCache;
+use OC\Certificate\CertificateManager;
use OC\DB\ConnectionWrapper;
use OC\Files\Node\Root;
use OC\Files\View;