diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-09-24 02:05:55 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-09-24 02:05:55 +0000 |
| commit | e0032eeee61f0cb83dbcd7e410bd85f8226b7ec7 (patch) | |
| tree | 21057bd3cbbe26cdcdf617fa16dbd960fca94a55 /modules/poll/poll.module | |
| parent | 5e1f9113e966e7766726416083ad9a5518e56218 (diff) | |
| download | brdo-e0032eeee61f0cb83dbcd7e410bd85f8226b7ec7.tar.gz brdo-e0032eeee61f0cb83dbcd7e410bd85f8226b7ec7.tar.bz2 | |
- Patch #844186 by chx: clarify merge queries.
Diffstat (limited to 'modules/poll/poll.module')
| -rw-r--r-- | modules/poll/poll.module | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 72cd86e66..9e314f11d 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -568,12 +568,11 @@ function poll_update($node) { db_merge('poll_choice') ->key(array('chid' => $choice['chid'])) ->fields(array( - 'nid' => $node->nid, 'chtext' => $choice['chtext'], 'chvotes' => (int) $choice['chvotes'], 'weight' => $choice['weight'], )) - ->updateExcept('nid') + ->insertFields(array('nid' => $node->nid)) ->execute(); } else { |