\r
function last_insert_id() {\r
global $db;\r
+\r
if (IMPORT_DEBUG)\r
return 1;\r
- if ($db->mysqli) {\r
- $thedb = $db->getdb();\r
- return $thedb->insert_id;\r
- } else {\r
- return mysql_insert_id();\r
- }\r
+\r
+ return $db->insert_id();\r
}\r
\r
function last_error() {\r
q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);\r
}\r
\r
-function import_account(&$a, $file) {\r
+function import_account(App $a, $file) {\r
logger("Start user import from " . $file['tmp_name']);\r
/*\r
STEPS\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
+ // set contacts 'avatar-date' to NULL_DATE to let poller to update urls\r
+ $contact["avatar-date"] = NULL_DATE;\r
\r
\r
switch ($contact['network']) {\r