Slight improvement to the "choiceboxes" thingie.

404cd22b · Steven Wittens · 54a4f06c · 404cd22b · 404cd22b
Commit 404cd22b authored May 22, 2001 by Steven Wittens
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

modules/poll.module modules/poll.module +1 -1

modules/poll/poll.module modules/poll/poll.module +1 -1

No files found.
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -163,7 +163,7 @@ function poll_form($edit = array(), $nocheck = 0) {
  $admin = ($edit[nid] && user_access($user,"poll")) ? 1 : 0;

  /* Mini-form for number of choiceboxes */
-  $choices = $edit[choices]?$edit[choices]:5;
+  $choices = $edit[choices]?$edit[choices]:max(5,sizeof($edit[choice]));
  for ($c = 2; $c <= 20; $c++) $opts[$c]=$c;
  $form .= form_select(t("Number of choices"), "choices", $choices, $opts, t("This box specifies the number of choiceboxes in this form, it doesn't affect the actual amount of choices in the poll."));
  $form .= form_submit(t("Refresh")) . "<br><br><br>";

--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -163,7 +163,7 @@ function poll_form($edit = array(), $nocheck = 0) {
  $admin = ($edit[nid] && user_access($user,"poll")) ? 1 : 0;

  /* Mini-form for number of choiceboxes */
-  $choices = $edit[choices]?$edit[choices]:5;
+  $choices = $edit[choices]?$edit[choices]:max(5,sizeof($edit[choice]));
  for ($c = 2; $c <= 20; $c++) $opts[$c]=$c;
  $form .= form_select(t("Number of choices"), "choices", $choices, $opts, t("This box specifies the number of choiceboxes in this form, it doesn't affect the actual amount of choices in the poll."));
  $form .= form_submit(t("Refresh")) . "<br><br><br>";