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:09:01 +0200
commit6e1864cb1731bb870d775ac15eea6589a779ab2e (patch)
tree9df6dc7c8127c9e6faa3e357302117c80d87976b
parent235680a2f156511b9cfd953c17e91fc572e0977c (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 aac9e6524..3ac39c3ee 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 Shift + delete button does not permanently delete messages (#1488243)
- Add Content-Length for attachments where possible (#1485478)
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index b03ba9cfa..52545a0d9 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -312,8 +312,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':