summaryrefslogtreecommitdiff
path: root/app/User.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-09-16 20:32:46 +0100
committerGreg Roach <fisharebest@gmail.com>2015-09-16 20:33:00 +0100
commit726c3cc74e6db49747e0123d1d81fca0bcc98761 (patch)
treed1fb30c6dfb4c028ca0d64940a3101135b585e87 /app/User.php
parente54e112d85595e0c8b853ef17159e55dbb9f39de (diff)
downloadwebtrees-726c3cc74e6db49747e0123d1d81fca0bcc98761.tar.gz
webtrees-726c3cc74e6db49747e0123d1d81fca0bcc98761.tar.bz2
webtrees-726c3cc74e6db49747e0123d1d81fca0bcc98761.zip
Cannot delete user with pending changes
Diffstat (limited to 'app/User.php')
-rw-r--r--app/User.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/User.php b/app/User.php
index b7a7f76c71..21821f2a99 100644
--- a/app/User.php
+++ b/app/User.php
@@ -263,8 +263,8 @@ class User {
// Don't delete the logs.
Database::prepare("UPDATE `##log` SET user_id=NULL WHERE user_id =?")->execute(array($this->user_id));
// Take over the user’s pending changes. (What else could we do with them?)
- Database::prepare("DELETE FROM `##change` WHERE user_id=? AND status='accepted'")->execute(array($this->user_id));
- Database::prepare("UPDATE `##change` SET user_id=? WHERE user_id=?")->execute(array($this->user_id, $this->user_id));
+ Database::prepare("DELETE FROM `##change` WHERE user_id=? AND status='rejected'")->execute(array($this->user_id));
+ Database::prepare("UPDATE `##change` SET user_id=? WHERE user_id=?")->execute(array(Auth::id(), $this->user_id));
Database::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE user_id=?")->execute(array($this->user_id));
Database::prepare("DELETE FROM `##block` WHERE user_id=?")->execute(array($this->user_id));
Database::prepare("DELETE FROM `##user_gedcom_setting` WHERE user_id=?")->execute(array($this->user_id));