Merge pull request #4397 from annando/no-new-guid
Don't generate a new guid anymore when moving the account.
This commit is contained in:
commit
21457c171b
|
@ -173,9 +173,6 @@ class UserImport
|
||||||
|
|
||||||
PConfig::set($newuid, 'system', 'previous_addr', $old_handle);
|
PConfig::set($newuid, 'system', 'previous_addr', $old_handle);
|
||||||
|
|
||||||
// Generate a new guid for the account. Otherwise there will be problems with diaspora
|
|
||||||
dba::update('user', ['guid' => generate_user_guid()], ['uid' => $newuid]);
|
|
||||||
|
|
||||||
foreach ($account['profile'] as &$profile) {
|
foreach ($account['profile'] as &$profile) {
|
||||||
foreach ($profile as $k => &$v) {
|
foreach ($profile as $k => &$v) {
|
||||||
$v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
|
$v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
|
||||||
|
|
Loading…
Reference in a new issue