From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 23 Apr 2012 19:08:38 +0000 (+0200)
Subject: Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/ownclo... 
X-Git-Tag: v4.0.0beta~210^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0cd9570277152d85a257b01e70d86e39ba8aa51c;p=nextcloud-server.git

Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
---

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 475d2c8dc2e..2c2cc331ed7 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -149,6 +149,7 @@ class OC_Contacts_App {
 				'WORK'  =>  $l->t('Work'),
 				'TEXT'  =>  $l->t('Text'),
 				'VOICE' =>  $l->t('Voice'),
+				'MSG'   =>  $l->t('Message'),
 				'FAX'   =>  $l->t('Fax'),
 				'VIDEO' =>  $l->t('Video'),
 				'PAGER' =>  $l->t('Pager'),
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 90b037f76ee..53c952656b6 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -214,7 +214,8 @@ class OC_Contacts_VCard{
 		$prodid = trim($vcard->getAsString('PRODID'));
 		if(!$prodid) {
 			$appinfo = OC_App::getAppInfo('contacts');
-			$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
+			$appversion = OC_App::getAppVersion('contacts');
+			$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appversion.'//EN';
 			$vcard->setString('PRODID', $prodid);
 		}
 		$now = new DateTime;