From 30c9cc1b21e5b5df962b738ee1f7c83c3eb3acd8 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Wed, 9 Feb 2022 18:52:22 -0800 Subject: [PATCH] detailed_phrase_score isn't used after version 2.6 --- spam/edit_report.cgi | 10 ++++++---- spam/save_report.cgi | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/spam/edit_report.cgi b/spam/edit_report.cgi index 21bf66719..98b02bc08 100755 --- a/spam/edit_report.cgi +++ b/spam/edit_report.cgi @@ -49,10 +49,12 @@ $fold = &find("fold_headers", $conf); print &ui_table_row($text{'report_fold'}, &yes_no_field("fold_headers", $fold, 1)); -# Include details of spam phrases -$detail = &find("detailed_phrase_score", $conf); -print &ui_table_row($text{'report_detail'}, - &yes_no_field("detailed_phrase_score", $detail, 0)); +if (!&version_atleast(2.6)) { + # Include details of spam phrases + $detail = &find("detailed_phrase_score", $conf); + print &ui_table_row($text{'report_detail'}, + &yes_no_field("detailed_phrase_score", $detail, 0)); + } if (!&version_atleast(2.6)) { # Include stars header diff --git a/spam/save_report.cgi b/spam/save_report.cgi index 2e5ed07be..3750c48f6 100755 --- a/spam/save_report.cgi +++ b/spam/save_report.cgi @@ -41,7 +41,8 @@ else { &parse_opt($conf, "spam_level_char", \&char_check); } &parse_yes_no($conf, "fold_headers"); -&parse_yes_no($conf, "detailed_phrase_score"); +&parse_yes_no($conf, "detailed_phrase_score") + if (defined($in{'detailed_phrase_score'})); &parse_yes_no($conf, "defang_mime"); &parse_option($conf, "report_safe") if (defined($in{'report_safe'}));