[interchange] Revert "Correct logic of DisplayErrors"

commit 1f6b456b9fea871b32af8b7587711bf43ea171c8
Author: David Christensen <[email protected]>
Date:   Mon Sep 11 16:45:19 2017 -0500

    Revert "Correct logic of DisplayErrors"
    
    This reverts commit 096f9b97470c0106594573dda4114e5adf25e81c.

 lib/Vend/Dispatch.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lib/Vend/Dispatch.pm b/lib/Vend/Dispatch.pm
index cea6640..eeb463e 100644
--- a/lib/Vend/Dispatch.pm
+++ b/lib/Vend/Dispatch.pm
@@ -690,7 +690,7 @@ Sorry, there was an error in processing this form action. Please
 report the error or try again later.
 EOF
 		$template .= "\n\nError: %s\n"
-				if $Global::DisplayErrors || $Vend::Cfg->{DisplayErrors}
+				if $Global::DisplayErrors && $Vend::Cfg->{DisplayErrors}
 			;
 		$template = get_locale_message(500, $template, $err);
 		logError($err);
@@ -1680,7 +1680,7 @@ EOF
 			and not ($Vend::admin and ! $::Variable->{MV_TRACK_ADMIN});
 # END TRACK
 
-	if($Vend::Cfg->{DisplayErrors} or $Global::DisplayErrors) {
+	if($Vend::Cfg->{DisplayErrors} and $Global::DisplayErrors) {
 		$SIG{"__DIE__"} = sub {
 							my $msg = shift;
 							put_session() if $Vend::HaveSession;
@@ -1889,7 +1889,7 @@ Sorry, there was an error in processing this form action. Please
 report the error or try again later.
 EOF
 		$template .= "\n\nError: %s\n"
-				if $Global::DisplayErrors || $Vend::Cfg->{DisplayErrors}
+				if $Global::DisplayErrors && $Vend::Cfg->{DisplayErrors}
 			;
 		$template = get_locale_message(500, $template, $err);
 		logError($err);