summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-04-23 21:08:38 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-04-24 01:44:07 +0200
commit0cd9570277152d85a257b01e70d86e39ba8aa51c (patch)
treeb7b23c23140cc34e45644531137bf6aa32a206e3
parent4ea927a7987d7fdcefcacb341f1a60b094ccf8d2 (diff)
downloadnextcloud-server-0cd9570277152d85a257b01e70d86e39ba8aa51c.tar.gz
nextcloud-server-0cd9570277152d85a257b01e70d86e39ba8aa51c.zip
Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
-rw-r--r--apps/contacts/lib/app.php1
-rw-r--r--apps/contacts/lib/vcard.php3
2 files changed, 3 insertions, 1 deletions
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;