- Applied some fixes from trunk

alecpl

2012-04-27 77799d87ba05a8e96d604693dcfa003b5835fe2b

 tests/vcards.php

@@ -44,7 +44,7 @@
    $input .= file_get_contents($this->_srcpath('johndoe.vcf'));
    
    $vcards = rcube_vcard::import($input);
    

    $this->assertEqual(2, count($vcards), "Detected 2 vcards");
    $this->assertEqual("Apple Computer AG", $vcards[0]->displayname, "FN => displayname");
    $this->assertEqual("John Doë", $vcards[1]->displayname, "Displayname with correct charset");