Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2015-08-10 cb4149cc6cf9d440d07b389591954b4b03a1f82f

 program/lib/Roundcube/rcube_vcard.php

@@ -124,11 +124,6 @@
            $this->raw = self::charset_convert($this->raw, $detected_charset);
        }

        // consider FN empty if the same as the primary e-mail address
        if ($this->raw['FN'][0][0] == $this->raw['EMAIL'][0][0]) {
            $this->raw['FN'][0][0] = '';
        }

        // find well-known address fields
        $this->displayname  = $this->raw['FN'][0][0];
        $this->surname      = $this->raw['N'][0][0];