Simplify checking whether to check spam in spoolnews.php.
This commit is contained in:
parent
c77225d364
commit
8a5cc20b1f
|
@ -458,11 +458,8 @@ function get_articles($ns, $group)
|
|||
$current_article['snippet'] = $this_snippet;
|
||||
|
||||
// Check Spam
|
||||
if ($OVERRIDES['disable_spamassassin_spooling'] === true) {
|
||||
$CONFIG['spamassassin'] = false;
|
||||
$res = 0;
|
||||
}
|
||||
if (isset($CONFIG['spamassassin']) && ($CONFIG['spamassassin'] == true)) {
|
||||
if (isset($CONFIG['spamassassin']) && ($CONFIG['spamassassin'] == true) && ($OVERRIDES['disable_spamassassin_spooling'] !== true)) {
|
||||
$spam_result_array = check_spam($subject[1], $from[1], $groupnames[1], $references, $body, $mid[1]);
|
||||
$res = $spam_result_array['res'];
|
||||
$spamresult = $spam_result_array['spamresult'];
|
||||
|
|
Loading…
Reference in New Issue