[Pkg-owncloud-commits] [owncloud-client] 106/498: PropfindJob: fix parsing of properties that have a sub element

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5cb10bf6a1beb123dc99eada2fb1e2f6583ee7aa
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri May 22 11:49:39 2015 +0200

    PropfindJob: fix parsing of properties that have a sub element
    
    The default argument of readElementText is ErrorOnUnexpectedElement which
    abort the parsing of remaining elements
---
 src/libsync/networkjobs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index 27d24b1..1e7999a 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -711,7 +711,7 @@ bool PropfindJob::finished()
             QXmlStreamReader::TokenType type = reader.readNext();
             if (type == QXmlStreamReader::StartElement) {
                 if (!curElement.isEmpty() && curElement.top() == QLatin1String("prop")) {
-                    items.insert(reader.name().toString(), reader.readElementText());
+                    items.insert(reader.name().toString(), reader.readElementText(QXmlStreamReader::SkipChildElements));
                 } else {
                     curElement.push(reader.name().toString());
                 }

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