diff --git a/themes/slashcode/htdocs/comments.pl b/themes/slashcode/htdocs/comments.pl index 08346947b..dada0bdc4 100755 --- a/themes/slashcode/htdocs/comments.pl +++ b/themes/slashcode/htdocs/comments.pl @@ -1006,10 +1006,6 @@ sub previewForm { $sig = "--
$sig"; } - my $subscriber_bonus = 0; - $subscriber_bonus = 1 - if $user->{is_subscriber} && $form->{nosubscriberbonus} ne 'on'; - my $preview = { nickname => $form->{postanon} ? getCurrentAnonymousCoward('nickname') @@ -1023,9 +1019,13 @@ sub previewForm { subject => $tempSubject, comment => $tempComment, sig => $sig, - subscriber_bonus => $subscriber_bonus, }; + if ($constants->{plugin}{Subscribe}) { + $preview->{subscriber_bonus} = $user->{is_subscriber} && $form->{nosubscriberbonus} ne 'on' + ? 1 : 0; + } + my $tm = $user->{mode}; $user->{mode} = 'archive'; my $previewForm; @@ -1135,7 +1135,8 @@ sub submitComment { $pts = $maxScore if $pts > $maxScore; $karma_bonus = 1 if $pts >= 1 && $user->{karma} > $constants->{goodkarma} && !$form->{nobonus}; - $subscriber_bonus = 1 if $user->{is_subscriber} + $subscriber_bonus = 1 if $constants->{plugin}{Subscribe} + && $user->{is_subscriber} && $form->{nosubscriberbonus} ne 'on'; } # This is here to prevent posting to discussions that don't exist/are nd -Brian @@ -1160,8 +1161,10 @@ sub submitComment { uid => $posters_uid, points => $pts, karma_bonus => $karma_bonus ? 'yes' : 'no', - subscriber_bonus => $subscriber_bonus ? 'yes' : 'no', }; + if ($constants->{plugin}{Subscribe}) { + $clean_comment->{subscriber_bonus} = $subscriber_bonus ? 'yes' : 'no'; + } my $maxCid = $slashdb->createComment($clean_comment);