Merge pull request #2149 from annando/issue-1921

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index fcc7e75a6120d99790062a7ee15b8f89876a3f0c..78471af1514461d33cdef9a13f7b1e5bd31503e8 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -28,7 +28,7 @@ function last_error() {
 \r
 /**\r
  * Remove columns from array $arr that aren't in table $table\r
- * \r
+ *\r
  * @param string $table Table name\r
  * @param array &$arr Column=>Value array from json (by ref)\r
  */\r
@@ -51,7 +51,7 @@ function check_cols($table, &$arr) {
 \r
 /**\r
  * Import data into table $table\r
- * \r
+ *\r
  * @param string $table Table name\r
  * @param array $arr Column=>Value array from json\r
  */\r
@@ -156,13 +156,15 @@ function import_account(&$a, $file) {
        $newuid = last_insert_id();\r
        //~ $newuid = 1;\r
 \r
-\r
+       // Generate a new guid for the account. Otherwise there will be problems with diaspora\r
+       q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",\r
+               dbesc(generate_user_guid()), intval($newuid));\r
 \r
        foreach ($account['profile'] as &$profile) {\r
                foreach ($profile as $k => &$v) {\r
                        $v = str_replace($oldbaseurl, $newbaseurl, $v);\r
                        foreach (array("profile", "avatar") as $k)\r
-                               $v = str_replace($newbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);\r
+                               $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);\r
                }\r
                $profile['uid'] = $newuid;\r
                $r = db_import_assoc('profile', $profile);\r
@@ -180,14 +182,14 @@ function import_account(&$a, $file) {
                        foreach ($contact as $k => &$v) {\r
                                $v = str_replace($oldbaseurl, $newbaseurl, $v);\r
                                foreach (array("profile", "avatar", "micro") as $k)\r
-                                       $v = str_replace($newbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);\r
+                                       $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);\r
                        }\r
                }\r
                if ($contact['uid'] == $olduid && $contact['self'] == '0') {\r
                        // set contacts 'avatar-date' to "0000-00-00 00:00:00" to let poller to update urls\r
                        $contact["avatar-date"] = "0000-00-00 00:00:00" ;\r
-               \r
-               \r
+\r
+\r
                        switch ($contact['network']) {\r
                                case NETWORK_DFRN:\r
                                        //  send relocate message (below)\r