summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-13 12:14:42 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-13 12:14:42 +0200
commit21be27273c6fb74456b187018dc2584a4514a502 (patch)
tree0b16d93aad5bb295f488daafbfa874b590a278a5 /program/include
parent7456c27b47937d05fee84881e50dec66853975fa (diff)
parent64584be909914b8eb3fa0e1e8681b6883ba25244 (diff)
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Conflicts: CHANGELOG
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_vcard.php5
1 files changed, 3 insertions, 2 deletions
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':