friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Review updates 

self:: const and fix up callback function and array_walk
This commit is contained in:
Adam Magness 2018-01-14 15:56:36 -05:00
parent e70e48abaa
commit 8be6989bd1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/UserImport.php
View File

@ -24,7 +24,7 @@ class UserImport
private static function lastInsertId() private static function lastInsertId()
{ {
if (IMPORT_DEBUG) { if (self::IMPORT_DEBUG) {
return 1; return 1;
} }
@ -73,7 +73,7 @@ class UserImport
$query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')"; $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
logger("uimport: $query", LOGGER_TRACE); logger("uimport: $query", LOGGER_TRACE);
if (IMPORT_DEBUG) { if (self::IMPORT_DEBUG) {
return true; return true;
} }
@ -155,11 +155,11 @@ class UserImport
unset($account['user']['account_expires_on']); unset($account['user']['account_expires_on']);
unset($account['user']['expire_notification_sent']); unset($account['user']['expire_notification_sent']);
$callback = function ($key, $value) use ($oldbaseurl, $oldaddr, $newbaseurl, $newaddr) { $callback = function (&$value) use ($oldbaseurl, $oldaddr, $newbaseurl, $newaddr) {
return str_replace(array($oldbaseurl, $oldaddr), array($newbaseurl, $newaddr), $value); $value = str_replace(array($oldbaseurl, $oldaddr), array($newbaseurl, $newaddr), $value);
}; };
$v = array_map($account['user'], $callback); array_walk($account['user'], $callback);
// import user // import user
$r = self::dbImportAssoc('user', $account['user']); $r = self::dbImportAssoc('user', $account['user']);