Migration: Fix contacts and bookmarks

diff --git a/apps/bookmarks/appinfo/migrate.php b/apps/bookmarks/appinfo/migrate.php
index e7e572f52dc881c89782b4883bf1e4cfc766370a..f1353f1887eb180db6d402761a378c8bc5317b7b 100644 (file)
--- a/apps/bookmarks/appinfo/migrate.php
+++ b/apps/bookmarks/appinfo/migrate.php
@@ -40,8 +40,8 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
                                $idmap = array();
                                while( $row = $results->fetchRow() ){
                                        // Import each bookmark, saving its id into the map     
-                                       $query = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks(url, title, user_id, public, added, lastmodified) VALUES (?, ?, ?, ?, ?, ?)" );
-                                       $query->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) );
+                                       $bookmarkquery = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks(url, title, user_id, public, added, lastmodified) VALUES (?, ?, ?, ?, ?, ?)" );
+                                       $bookmarkquery->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) );
                                        // Map the id
                                        $idmap[$row['id']] = OCP\DB::insertid();
                                }
@@ -51,8 +51,8 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
                                        $results = $query->execute( array( $oldid ) );
                                        while( $row = $results->fetchRow() ){
                                                // Import the tags for this bookmark, using the new bookmark id
-                                               $query = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" );
-                                               $query->execute( array( $newid, $row['tag'] ) );        
+                                               $tagquery = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" );
+                                               $tagquery->execute( array( $newid, $row['tag'] ) );     
                                        }               
                                }
                                // All done!

diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
index 1400cdf79d4707d4b76da70674b430ee1c8993aa..cceb4406172933db1510350b999927590d4bfeda 100644 (file)
--- a/apps/contacts/appinfo/migrate.php
+++ b/apps/contacts/appinfo/migrate.php
@@ -40,19 +40,20 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
                                $idmap = array();
                                while( $row = $results->fetchRow() ){
                                        // Import each bookmark, saving its id into the map     
-                                       $query = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
-                                       $query->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
+                                       $addressbookquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
+                                       $addressbookquery->execute( array( $this->uid, $row['displayname'], $row['uri'], $row['description'], $row['ctag'] ) );
                                        // Map the id
                                        $idmap[$row['id']] = OCP\DB::insertid();
                                }
                                // Now tags
                                foreach($idmap as $oldid => $newid){
+                                       
                                        $query = $this->content->prepare( "SELECT * FROM contacts_cards WHERE addressbookid LIKE ?" );
                                        $results = $query->execute( array( $oldid ) );
                                        while( $row = $results->fetchRow() ){
                                                // Import the tags for this bookmark, using the new bookmark id
-                                               $query = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
-                                               $query->execute( array( $newid, $row['fullname'], $row['carddata'], $row['uri'], $row['lastmodified'] ) );      
+                                               $contactquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
+                                               $contactquery->execute( array( $newid, $row['fullname'], $row['carddata'], $row['uri'], $row['lastmodified'] ) );       
                                        }               
                                }
                                // All done!