summaryrefslogtreecommitdiff
path: root/modules/poll
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2005-11-12 02:54:13 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2005-11-12 02:54:13 +0000
commit85492ae9a548f0bfb58b673ac555f73d4b7977ed (patch)
treee980f521b5a0d66f7eac6020902de1628dba6633 /modules/poll
parent76226df8672409b23856b8ade20d1d884d934af8 (diff)
downloadbrdo-85492ae9a548f0bfb58b673ac555f73d4b7977ed.tar.gz
brdo-85492ae9a548f0bfb58b673ac555f73d4b7977ed.tar.bz2
#36791: node_validate was called twice
Diffstat (limited to 'modules/poll')
-rw-r--r--modules/poll/poll.module16
1 files changed, 11 insertions, 5 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 89e2757f3..8ee7c3b3a 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -90,11 +90,19 @@ function poll_delete($node) {
}
/**
+ * Implementation of hook_execute().
+ */
+function poll_execute(&$node) {
+ // Renumber fields
+ $node->choice = array_values($node->choice);
+ $node->teaser = poll_teaser($node);
+}
+
+/**
* Implementation of hook_validate().
*/
-function poll_validate(&$node) {
-
- node_validate_title($node,t('You have to specify a question.'));
+function poll_validate($node) {
+ node_validate_title($node, t('You have to specify a question.'));
if (isset($node->title)) {
// Check for at least two options and validate amount of votes:
@@ -114,8 +122,6 @@ function poll_validate(&$node) {
form_set_error("choice][$realchoices][chtext", t('You must fill in at least two choices.'));
}
}
-
- $node->teaser = poll_teaser($node);
}
/**