diff options
Diffstat (limited to 'admin_pgv_to_wt.php')
| -rw-r--r-- | admin_pgv_to_wt.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/admin_pgv_to_wt.php b/admin_pgv_to_wt.php index 72f69a0cf5..eb337e6d5f 100644 --- a/admin_pgv_to_wt.php +++ b/admin_pgv_to_wt.php @@ -196,12 +196,12 @@ Database::beginTransaction(); // Delete the existing user accounts, and any information associated with it Database::exec("UPDATE `##log` SET user_id=NULL"); Database::exec("DELETE FROM `##change`"); -Database::exec("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE user_id>0 OR gedcom_id>0"); -Database::exec("DELETE FROM `##block` WHERE user_id>0 OR gedcom_id>0"); +Database::exec("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE user_id>0 OR gedcom_id>0"); +Database::exec("DELETE FROM `##block` WHERE user_id>0 OR gedcom_id>0"); Database::exec("DELETE FROM `##message`"); Database::exec("DELETE FROM `##user_gedcom_setting` WHERE user_id>0"); -Database::exec("DELETE FROM `##user_setting` WHERE user_id>0"); -Database::exec("DELETE FROM `##user` WHERE user_id>0"); +Database::exec("DELETE FROM `##user_setting` WHERE user_id>0"); +Database::exec("DELETE FROM `##user` WHERE user_id>0"); //////////////////////////////////////////////////////////////////////////////// @@ -302,7 +302,7 @@ if ($PGV_SCHEMA_VERSION >= 12) { echo '<p>pgv_user => wt_user…</p>'; try { - // "INSERT IGNORE" is needed to allow for PhpGedView users with duplicate emails. Only the first will be imported. + // "INSERT IGNORE" is needed to allow for PhpGedView users with duplicate emails. Only the first will be imported. Database::prepare( "INSERT IGNORE INTO `##user` (user_id, user_name, real_name, email, password)" . " SELECT user_id, user_name, CONCAT_WS(' ', us1.setting_value, us2.setting_value), us3.setting_value, password FROM `{$DBNAME}`.`{$TBLPREFIX}user`" . @@ -419,7 +419,7 @@ if ($PGV_SCHEMA_VERSION >= 12) { echo '<p>pgv_users => wt_user…</p>'; try { - // "INSERT IGNORE" is needed to allow for PhpGedView users with duplicate emails. Only the first will be imported. + // "INSERT IGNORE" is needed to allow for PhpGedView users with duplicate emails. Only the first will be imported. Database::prepare( "INSERT IGNORE INTO `##user` (user_name, real_name, email, password)" . " SELECT u_username, CONCAT_WS(' ', u_firstname, u_lastname), u_email, u_password FROM `{$DBNAME}`.`{$TBLPREFIX}users`" @@ -1015,7 +1015,7 @@ if ($PGV_SCHEMA_VERSION >= 13) { try { $statement->execute(array($GED_DATA['id'], $page_name, $page_parameter, $match[3])); } catch (PDOException $ex) { - // Primary key violation? Ignore? + // Primary key violation? Ignore? } } } |