From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 13 May 2012 21:25:51 +0000 (+0200)
Subject: Contacts: Forgot one file for the import fix.
X-Git-Tag: v4.0.0RC2~79
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4e1e978b89adf49eaeb152688525d027ac1e4c57;p=nextcloud-server.git

Contacts: Forgot one file for the import fix.
---

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 330d5b21b79..29428763d60 100755
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -12,8 +12,15 @@
 OC_Contacts_App::$l10n = OC_L10N::get('contacts');
 OC_Contacts_App::$categories = new OC_VCategories('contacts');
 class OC_Contacts_App {
+	/*
+	 * @brief language object for calendar app
+	 */
+
 	public static $l10n;
-	public static $categories;
+	/*
+	 * @brief categories of the user
+	 */
+	public static $categories = null;
 
 	public static function getAddressbook($id) {
 		$addressbook = OC_Contacts_Addressbook::find( $id );
@@ -130,6 +137,21 @@ class OC_Contacts_App {
 		}
 	}
 
+	/*
+	 * @brief returns the vcategories object of the user
+	 * @return (object) $vcategories
+	 */
+	protected static function getVCategories() {
+		if (is_null(self::$categories)) {
+			self::$categories = new OC_VCategories('contacts');
+		}
+		return self::$categories;
+	}
+	
+	/*
+	 * @brief returns the categories for the user
+	 * @return (Array) $categories
+	 */
 	public static function getCategories() {
 		$categories = self::$categories->categories();
 		if(count($categories) == 0) {
@@ -169,7 +191,7 @@ class OC_Contacts_App {
 	 * @see OC_VCategories::loadFromVObject
 	 */
 	public static function loadCategoriesFromVCard(OC_VObject $contact) {
-		self::$categories->loadFromVObject($contact, true);
+		self::getVCategories()->loadFromVObject($contact, true);
 	}
 
 	public static function setLastModifiedHeader($contact) {