Merge branch '2.1'

evert · evert · commit 008f847979bf · 2015-07-14T14:08:17.000-04:00
diff --git a/bin/migrateto21.php b/bin/migrateto21.php
@@ -122,7 +122,7 @@
             $vobj = \Sabre\VObject\Reader::read($row['calendardata']);
         } catch (\Exception $e) {
             echo "Warning! Item with id $row[id] could not be parsed!\n";
-            goto yoyo;
+            continue;
         }
         $uid = null;
         $item = $vobj->getBaseComponent();

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@`
`122`	`122`	`$vobj = \Sabre\VObject\Reader::read($row['calendardata']);`
`123`	`123`	`} catch (\Exception $e) {`
`124`	`124`	`echo "Warning! Item with id $row[id] could not be parsed!\n";`
`125`		`- goto yoyo;`
	`125`	`+ continue;`
`126`	`126`	`}`
`127`	`127`	`$uid = null;`
`128`	`128`	`$item = $vobj->getBaseComponent();`