Fix bug 784487 - calendar-multiget request is not correctly formatted (regression). r=philipp
authorinfo@dupondje.be <info@dupondje.be>
Wed, 22 Aug 2012 17:24:49 +0200
changeset 13322 06e3e6f847aeffe1e704e84c9edd751f556b891d
parent 13321 04b3786379863fd1e9233abcf7e755231b90b809
child 13323 9c51b6b891ca3b4e122d24623d442609584fadc9
child 13324 3f9b812e72471c2172bfde0ebbeeb210bf5f1a95
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs784487
Fix bug 784487 - calendar-multiget request is not correctly formatted (regression). r=philipp
calendar/providers/caldav/calDavRequestHandlers.js
--- a/calendar/providers/caldav/calDavRequestHandlers.js
+++ b/calendar/providers/caldav/calDavRequestHandlers.js
@@ -683,21 +683,21 @@ multigetSyncHandler.prototype = {
             // encodes it before it is sent to the server
             let locpath = this.calendar.ensureEncodedPath(this.itemsNeedFetching.pop());
             hrefString += "<D:href>" + cal.xml.escapeString(locpath) + "</D:href>";
         }
 
         let queryXml =
           xmlHeader +
           '<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">' +
-            hrefString +
             '<D:prop>' +
               '<D:getetag/>' +
               '<C:calendar-data/>' +
             '</D:prop>' +
+            hrefString +
           '</C:calendar-multiget>';
 
         let requestUri = this.calendar.makeUri(null, this.baseUri);
         if (this.calendar.verboseLogging()) {
             cal.LOG("CalDAV: send(" + requestUri.spec + "): " + queryXml);
         }
         let httpchannel = cal.prepHttpChannel(requestUri,
                                               queryXml,