[Pkg-owncloud-commits] [php-sabredav] 01/17: Fixed the second issue from #566.

[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-sabredav.

commit b8880267c98eb3a53000661266dbd3212488013c
Author: Evert Pot <me at evertpot.com>
Date:   Sat Nov 22 19:57:14 2014 -0500

    Fixed the second issue from #566.
---
 ChangeLog.md        | 8 ++++++++
 bin/migrateto21.php | 2 +-
 lib/DAV/Version.php | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 327e84c..3533bd5 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,14 @@
 ChangeLog
 =========
 
+2.1.2 (2014-??-??)
+------------------
+
+* #566: Another issue related to the migration script, which would cause
+  scheduling to not work well for events that were already added before the
+  migration.
+
+
 2.1.1 (2014-11-22)
 ------------------
 
diff --git a/bin/migrateto21.php b/bin/migrateto21.php
index d5e85f0..c0cef52 100755
--- a/bin/migrateto21.php
+++ b/bin/migrateto21.php
@@ -132,7 +132,7 @@ if ($addUid) {
             echo "Warning! Item with id $item[id] does NOT have a UID property and this is required.\n";
             goto yoyo;
         }
-        $uid = (string)$uid;
+        $uid = (string)$item->UID;
         $stmt->execute([$uid, $row['id']]);
         $counter++;
 
diff --git a/lib/DAV/Version.php b/lib/DAV/Version.php
index fbb5cac..4449e9f 100644
--- a/lib/DAV/Version.php
+++ b/lib/DAV/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '2.1.1';
+    const VERSION = '2.1.2';
 
 }

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