Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/ownclo...

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 475d2c8dc2e88ded97664e07e70e2dd079a7623e..2c2cc331ed7bb8875f94be70abb1120291f2113f 100644 (file)
--- 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 90b037f76ee161dc29b80bc5be52ee23b8038cf7..53c952656b66531837420ccda090faf99c42f774 100644 (file)
--- 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;