Fix regular expression.
Support votenames longer than one line (in fact, support votenames up to two lines long). Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
parent
b9f5201405
commit
f908d8a11a
|
@ -241,8 +241,9 @@ sub process_vote {
|
||||||
}
|
}
|
||||||
|
|
||||||
# correct voting?
|
# correct voting?
|
||||||
if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)\s*$/m) {
|
if ($$body =~ /\Q$config{ballotintro}\E\s+(.+?)\s*\n(.*?[\t ]+(\S+.+)\s*$)?/m) {
|
||||||
$voting = $1;
|
$voting = $1;
|
||||||
|
$voting .= " $3" if defined($3);
|
||||||
push (@errors, 'WrongVoting') if ($config{votename} !~ /^\s*\Q$voting\E\s*$/);
|
push (@errors, 'WrongVoting') if ($config{votename} !~ /^\s*\Q$voting\E\s*$/);
|
||||||
} else {
|
} else {
|
||||||
push (@errors, 'NoVoting');
|
push (@errors, 'NoVoting');
|
||||||
|
|
Loading…
Reference in a new issue