Condense whitespace in composite fields (Request #8654).

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
index 621e221..2ae0e07 100644 (file)
--- a/turba/docs/CHANGES
+++ b/turba/docs/CHANGES
@@ -10,6 +10,7 @@ v3.0-git
 v2.3.3-cvs
 ----------
 
+[jan] Condense whitespace in composite fields (Request #8654).
 [jan] Add Oracle-specific upgrade script.
 [jan] Add Croatian translation (Matej Vela <matej.vela@carnet.hr>,
       Iva Rumora <iva.rumora@zg.t-com.hr>).

diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
index 63792a0..4e08213 100644 (file)
--- a/turba/lib/Driver.php
+++ b/turba/lib/Driver.php
@@ -218,7 +218,7 @@ class Turba_Driver
                             $fieldarray[] = '';
                         }
                     }
-                    $fields[$this->map[$key]['attribute']] = trim(vsprintf($this->map[$key]['format'], $fieldarray), " \t\n\r\0\x0B,");
+                    $fields[$this->map[$key]['attribute']] = preg_replace('/\s+/', ' ', trim(vsprintf($this->map[$key]['format'], $fieldarray), " \t\n\r\0\x0B,"));
                 } else {
                     // If 'parse' is not specified, use 'format' and 'fields'.
                     if (!isset($this->map[$key]['parse'])) {