Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Correct logic of DisplayErrors
Most directives (and other places with this specific directive) use 'or' logic to allow you to
define directives in either `interchange.cfg` or `catalog.cfg` to enable a default-off behavior at
either the Interchange server level or at the level of a specific catalog.

As originally coded, the DisplayErrors directive would have only worked when *both*
`interchange.cfg` and `catalog.cfg` had this enabled.

Change this so it shows up when either the current catalog or the global config has this set.

Since the old default was 'no', someone intended this information to be output, so this is the
correct behavior, considering that I only fixed the output of this message in the previous commit.
  • Loading branch information
David Christensen committed Sep 8, 2017
1 parent dd1df73 commit 096f9b9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/Vend/Dispatch.pm
Expand Up @@ -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);
Expand Down Expand Up @@ -1680,7 +1680,7 @@ EOF
and not ($Vend::admin and ! $::Variable->{MV_TRACK_ADMIN});
# END TRACK

if($Vend::Cfg->{DisplayErrors} and $Global::DisplayErrors) {
if($Vend::Cfg->{DisplayErrors} or $Global::DisplayErrors) {
$SIG{"__DIE__"} = sub {
my $msg = shift;
put_session() if $Vend::HaveSession;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 096f9b9

Please sign in to comment.