From 803dacf65225d78c2ffe60a853b1c822f4e628e1 Mon Sep 17 00:00:00 2001 From: Steven Wittens Date: Wed, 14 Apr 2004 14:02:36 +0000 Subject: 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. --- modules/poll/poll.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/poll/poll.module') 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) { -- cgit v1.2.3