[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi] server/src: Ignore accidentaly created "PARENT" collection attributes.
From:       Christian Mollekopf <chrigi_1 () fastmail ! fm>
Date:       2014-02-28 18:20:08
Message-ID: E1WJS2a-0008LG-9s () scm ! kde ! org
[Download RAW message or body]

Git commit 09f39f058837ea1a33a8960073f4f63ae2cd8a88 by Christian Mollekopf.
Committed on 28/02/2014 at 18:19.
Pushed by cmollekopf into branch 'master'.

Ignore accidentaly created "PARENT" collection attributes.

This fixes the "Invalid syntax" error that occurred during collection modify jobs.

M  +4    -0    server/src/handlerhelper.cpp

http://commits.kde.org/akonadi/09f39f058837ea1a33a8960073f4f63ae2cd8a88

diff --git a/server/src/handlerhelper.cpp b/server/src/handlerhelper.cpp
index 0d1a0a7..1b43c2b 100644
--- a/server/src/handlerhelper.cpp
+++ b/server/src/handlerhelper.cpp
@@ -249,6 +249,10 @@ QByteArray HandlerHelper::collectionToByteArray( const Collection &col, bool hid
   const CollectionAttribute::List attrs = col.attributes();
   for ( int i = 0; i < attrs.size(); ++i ) {
     const CollectionAttribute &attr = attrs[i];
+    //Workaround to skip invalid "PARENT " attributes that were accidentaly created after 6e5bbf6
+    if ( attr.type() == "PARENT" ) {
+      continue;
+    }
     b += attr.type() + ' ' + ImapParser::quote( attr.value() );
     if ( i != attrs.size() - 1 ) {
       b += ' ';
[prev in list] [next in list] [prev in thread] [next in thread]