[Pkg-owncloud-commits] [php-sabre-vobject] 07/128: Fix for Issue #68.

[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 33dfd6a0b566215a703b0156d7c9b57ce5d35f4a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Nov 15 15:23:03 2013 -0500

    Fix for Issue #68.
---
 lib/Sabre/VObject/Parser/MimeDir.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Sabre/VObject/Parser/MimeDir.php b/lib/Sabre/VObject/Parser/MimeDir.php
index dba9fed..eb0e21e 100644
--- a/lib/Sabre/VObject/Parser/MimeDir.php
+++ b/lib/Sabre/VObject/Parser/MimeDir.php
@@ -282,7 +282,7 @@ class MimeDir extends Parser {
         $regex = "/
             ^(?P<name> [$propNameToken]+ ) (?=[;:])        # property name
             |
-            (?<=:)(?P<propValue> .*)$                      # property value
+            (?<=:)(?P<propValue> .+)$                      # property value
             |
             ;(?P<paramName> [$paramNameToken]+) (?=[=;:])  # parameter name
             |
@@ -355,7 +355,10 @@ class MimeDir extends Parser {
 
         }
 
-        if (is_null($property['value']) || !$property['name']) {
+        if (is_null($property['value'])) {
+            $property['value'] = '';
+        }
+        if (!$property['name']) {
             if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
                 return false;
             }

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