Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.

This commit is contained in:
Colin Kuskie 2010-07-27 22:55:57 -07:00
commit ca9a3bd6c7
34 changed files with 386 additions and 49 deletions

View file

@ -1127,7 +1127,7 @@ sub postProcess {
my %data = ();
($data{synopsis}, $data{content}) = $self->getSynopsisAndContent($self->synopsis, $self->content);
my $spamStopWords = $self->session->config->get('spamStopWords');
if (ref $spamStopWords eq 'ARRAY') {
if (ref $spamStopWords eq 'ARRAY' && @{ $spamStopWords }) {
my $spamRegex = join('|',@{$spamStopWords});
$spamRegex =~ s/\s/\\ /g;
if ($data{content} =~ m/$spamRegex/xmsi) {