1 files changed, 11 insertions, 3 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 5152687df..f280276b6 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -815,9 +815,17 @@ function poll_cancel($form, &$form_state) {
 }
 
 /**
- * Implementation of hook_user_delete().
+ * Implementation of hook_user_cancel().
  */
-function poll_user_delete(&$edit, &$user) {
-  db_query('UPDATE {poll_vote} SET uid = 0 WHERE uid = %d', $user->uid);
+function poll_user_cancel(&$edit, &$account, $method) {
+  switch ($method) {
+    case 'user_cancel_reassign':
+      db_update('poll_vote')->fields(array('uid' => 0))->condition('uid', $account->uid)->execute();
+      break;
+
+    case 'user_cancel_delete':
+      db_delete('poll_vote')->condition('uid', $account->uid)->execute();
+      break;
+  }
 }