Use also Organization field as a fallback if contact has no name(s) specified

Aleksander Machniak

2015-02-24 4d90e6596dfd7b7e2d0a3155667632bf0f42750b

Use also Organization field as a fallback if contact has no name(s) specified

 program/lib/Roundcube/rcube_addressbook.php

@@ -544,13 +544,20 @@

        $fn = trim($fn, ', ');

        // fallback to display name
        if (empty($fn) && $contact['name'])
        // fallbacks...
        if ($fn === '') {
            // ... display name
            if (!empty($contact['name'])) {
            $fn = $contact['name'];

        // fallback to email address
        if (empty($fn) && ($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
            return $email[0];
            }
            // ... organization
            else if (!empty($contact['organization'])) {
                $fn = $contact['organization'];
            }
            // ... email address
            else if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
                $fn = $email[0];
            }
        }

        return $fn;