diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-04-14 14:02:36 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-04-14 14:02:36 +0000 |
| commit | 803dacf65225d78c2ffe60a853b1c822f4e628e1 (patch) | |
| tree | 100589c9025917ddd5888207f06e6a4b10d26248 /modules/poll/poll.module | |
| parent | fd0ef2cc48e683e2ae2eff0b48435011a5858061 (diff) | |
| download | brdo-803dacf65225d78c2ffe60a853b1c822f4e628e1.tar.gz brdo-803dacf65225d78c2ffe60a853b1c822f4e628e1.tar.bz2 | |
Poll.module / Statistics.module: fixing bug caused by using array_merge and drupal_map_assoc. This causes array keys to be renumbered, leading to bugs.
Remember to use $array1 + $array2 instead.
Diffstat (limited to 'modules/poll/poll.module')
| -rw-r--r-- | modules/poll/poll.module | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module index faf4fc3b3..99cba5646 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -131,7 +131,7 @@ function poll_form(&$node, &$error) { // Poll attributes - $_duration = array_merge(array(0 => t('Unlimited')), drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval")); + $_duration = array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval"); $_active = array(0 => t('Closed'), 1 => t('Active')); if ($admin) { |