Fix PHP warning

Author: alecpl

program/lib/Roundcube/rcube_vcard.php

@@ -231,7 +231,7 @@ public function get_assoc()
                                 && !in_array($k, ['pref', 'internet', 'voice', 'base64'])
                             ) {
                                 $k_uc = strtoupper($k);
-                                $subtype = $typemap[$k_uc] ?: $k;
+                                $subtype = !empty($typemap[$k_uc]) ? $typemap[$k_uc] : $k;
                                 break;
                             }
                         }

tests/Framework/VCardTest.php

@@ -32,6 +32,9 @@ public function test_parse_two()
         $this->assertSame('roundcube.net', $vcard->organization, 'Test organization field');
         $this->assertCount(2, $vcard->email, 'List two e-mail addresses');
         $this->assertSame('roundcube@gmail.com', $vcard->email[0], 'Use PREF e-mail as primary');
+
+        $contact = $vcard->get_assoc();
+        $this->assertSame('The notes...', $contact['notes'][0]);
     }
 
     /**