Merge pull request #119 from christianruhstaller/master

Always return charset for strings

Author: jeroendesloovere

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "jeroendesloovere/vcard",
+    "name": "christianruhstaller/vcard",
     "type": "library",
     "description": "This VCard PHP class can generate a vCard with some data. When using an iOS device it will export as a .ics file because iOS devices don't support the default .vcf files.",
     "keywords": ["vcard", "generator", ".vcf", "php"],
@@ -23,4 +23,4 @@
     "autoload": {
         "psr-4": { "JeroenDesloovere\\VCard\\": "src/" }
     }
-}
+}

src/VCard.php

@@ -674,12 +674,7 @@ public function getCharset()
      */
     public function getCharsetString()
     {
-        $charsetString = '';
-        if ($this->charset == 'utf-8') {
-            $charsetString = ';CHARSET=' . $this->charset;
-        }
-
-        return $charsetString;
+        return ';CHARSET=' . $this->charset;
     }
 
     /**