Changeset 429

Timestamp:

09/05/09 19:00:34 (15 years ago)

Author:

nanardon

Message:

• avoid undef values
• if site is not set, use city

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -94 +94 @@
                     ($self->_get_c_field('givenName'),
                     ($self->_get_c_field('sn'))))
-                || $self->_get_c_field('description'),
-            join(' - ', grep { $_ } ($self->_get_c_field('site'),
-                $self->_get_c_field('physicalDeliveryOfficeName'))),
-            $self->_get_c_field('telephoneNumber'),
+                || $self->_get_c_field('description') || '',
+            join(' - ', grep { $_ } (($self->_get_c_field('site') ||
+                        $self->_get_c_field('l')),
+                $self->_get_c_field('physicalDeliveryOfficeName'))) || '',
+            $self->_get_c_field('telephoneNumber') || '',
             ''
         );