Diaspora now uses a 32 digit guid.

diff --git a/include/text.php b/include/text.php
index 58da443c2fdbb6b87264af5613d003da43bd5a0a..18ce232f1d12650674502db2757fe8a342655e35 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1788,7 +1788,7 @@ function return_bytes ($size_str) {
 function generate_user_guid() {
        $found = true;
        do {
-               $guid = random_string(16);
+               $guid = get_guid(32);
                $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
                        dbesc($guid)
                );

diff --git a/include/uimport.php b/include/uimport.php
index b8439ee0944c8192fec2557134db68c234f09bcb..78471af1514461d33cdef9a13f7b1e5bd31503e8 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -157,7 +157,8 @@ function import_account(&$a, $file) {
        //~ $newuid = 1;\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", generate_user_guid(), $newuid);\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