[Pkg-owncloud-commits] [php-sabre-vobject] 03/29: Charset in reader.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 6ddbbd0c066d60fc70a2763b4aeccaa7af8a1938
Author: Evert Pot <me at evertpot.com>
Date:   Wed Dec 2 01:39:09 2015 -0500

    Charset in reader.
---
 CHANGELOG.md   | 1 +
 lib/Reader.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c428b26..b07c19a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ ChangeLog
 ------------------
 
 * `ParseException` now extends `\Exception`.
+* `Sabre\VObject\Reader::read` now has a `$charset` argument.
 
 
 4.0.0-beta1 (2015-12-02)
diff --git a/lib/Reader.php b/lib/Reader.php
index 7376e58..b5dc923 100644
--- a/lib/Reader.php
+++ b/lib/Reader.php
@@ -36,12 +36,13 @@ class Reader {
      *
      * @param string|resource $data
      * @param int $options
-     *
+     * @param string $charset
      * @return Document
      */
-    static function read($data, $options = 0) {
+    static function read($data, $options = 0, $charset = 'UTF-8') {
 
         $parser = new Parser\MimeDir();
+        $parser->setCharset($charset);
         $result = $parser->parse($data, $options);
 
         return $result;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git