summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-10 10:09:01 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-10 10:10:37 +0200
commit2c48c19387dad1a85f6735848ea9542be9d33413 (patch)
treed2375bca44344ba442be83a16b42641734f9690c
parenta2ec2ebff2a92f066aff06b1a80a52534fc063f4 (diff)
Fix storing X-ANNIVERSARY date in vCard format (#1488527)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_vcard.php5
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index adf202762..b58ec3180 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix storing X-ANNIVERSARY date in vCard format (#1488527)
- Update to Mail_Mime-1.8.5 (#1488521)
- Fix XSS vulnerability in message subject handling using Larry skin (#1488519)
- Fix handling of links with various URI schemes e.g. "skype:" (#1488106)
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index e4a42f5cf..c07b4042a 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -315,8 +315,9 @@ class rcube_vcard
break;
case 'birthday':
- if ($val = rcube_strtotime($value))
- $this->raw['BDAY'][] = array(0 => date('Y-m-d', $val), 'value' => array('date'));
+ case 'anniversary':
+ if (($val = rcube_strtotime($value)) && ($fn = self::$fieldmap[$field]))
+ $this->raw[$fn][] = array(0 => date('Y-m-d', $val), 'value' => array('date'));
break;
case 'address':