diff options
author | Bart Visscher <bartv@thisnet.nl> | 2012-12-11 13:38:57 -0800 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2012-12-11 13:38:57 -0800 |
commit | ddba90679dcdc62089c3d6a0558fe54a4d30cb8a (patch) | |
tree | ae5649763398514bfd8e5465bc3697ca0b1b5716 | |
parent | 2361639a0d3b16c284367b725459704dc15ddc03 (diff) | |
parent | 8ed0ce7801985d6d7e07af8eb21de480a4422f2c (diff) | |
download | nextcloud-server-ddba90679dcdc62089c3d6a0558fe54a4d30cb8a.tar.gz nextcloud-server-ddba90679dcdc62089c3d6a0558fe54a4d30cb8a.zip |
Merge pull request #829 from owncloud/contacts_api_namespace_fix
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide...
-rw-r--r-- | lib/public/contacts.php | 10 | ||||
-rw-r--r-- | lib/public/iaddressbook.php (renamed from lib/iaddressbook.php) | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/public/contacts.php b/lib/public/contacts.php index ab46614c8fd..4cf57ed8ff2 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -146,16 +146,16 @@ namespace OCP { } /** - * @param \OC\IAddressBook $address_book + * @param \OCP\IAddressBook $address_book */ - public static function registerAddressBook(\OC\IAddressBook $address_book) { + public static function registerAddressBook(\OCP\IAddressBook $address_book) { self::$address_books[$address_book->getKey()] = $address_book; } /** - * @param \OC\IAddressBook $address_book + * @param \OCP\IAddressBook $address_book */ - public static function unregisterAddressBook(\OC\IAddressBook $address_book) { + public static function unregisterAddressBook(\OCP\IAddressBook $address_book) { unset(self::$address_books[$address_book->getKey()]); } @@ -179,7 +179,7 @@ namespace OCP { } /** - * @var \OC\IAddressBook[] which holds all registered address books + * @var \OCP\IAddressBook[] which holds all registered address books */ private static $address_books = array(); } diff --git a/lib/iaddressbook.php b/lib/public/iaddressbook.php index 39205140361..14943747f48 100644 --- a/lib/iaddressbook.php +++ b/lib/public/iaddressbook.php @@ -20,7 +20,9 @@ * */ -namespace OC { +// use OCP namespace for all classes that are considered public. +// This means that they should be used by apps instead of the internal ownCloud classes +namespace OCP { interface IAddressBook { /** |