From 0880caf704c28f719d19ae4e4490c531ea2bb49a Mon Sep 17 00:00:00 2001 From: Jeroen Desloovere Date: Thu, 22 Jan 2015 10:15:18 +0100 Subject: [PATCH 1/2] Fixes #8 Double space in FN name --- src/VCard.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/VCard.php b/src/VCard.php index fc61f55..647f51a 100644 --- a/src/VCard.php +++ b/src/VCard.php @@ -149,8 +149,23 @@ public function addName( // is property FN set? if (!isset($this->properties['FN']) || $this->properties['FN'] == '') { + $values = array( + $prefix, + $firstname, + $additional, + $lastname, + $suffix + ); + + // loop values and remove empty ones + foreach ($values as $key => $value) { + if (empty($value)) { + unset($values[$key]); + } + } + // set property - $this->setProperty('FN', trim($prefix . ' ' . $firstname . ' ' . $additional . ' ' . $lastname . ' ' . $suffix)); + $this->setProperty('FN', trim(implode(' ', $values))); } } From 526c7a8262b7f43de2110f224133d7516fa8ddf1 Mon Sep 17 00:00:00 2001 From: Jeroen Desloovere Date: Thu, 22 Jan 2015 10:15:23 +0100 Subject: [PATCH 2/2] Changelog added --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..1ae30ac --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +1.1.3 (2015-01-22) +-- +Bugfixes: +* Name: Double space when no "additional" field is given. Fixes #8