From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 8 Apr 2015 13:30:08 +0000 (+0200)
Subject: Backout bug 1089475, it causes deep recursions when the DB server is not accessible
X-Git-Tag: release-5.1.1~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6d2fb75aa3c183323c534a214f3dd9be5638676;p=thirdparty%2Fbugzilla.git

Backout bug 1089475, it causes deep recursions when the DB server is not accessible
---

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index afe728ca7d..9f3ed0f494 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -142,11 +142,6 @@ sub _handle_error {
     $_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000)
         if length($_[0]) > 4000;
     $_[0] = Carp::longmess($_[0]);
-
-    if (Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
-        ThrowCodeError("db_error", { err_message => $_[0] });
-    }
-
     return 0; # Now let DBI handle raising the error
 }
 
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index a242c74712..d73d75e135 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -104,10 +104,6 @@
   [% ELSIF error == "comment_type_invalid" %]
     '[% type FILTER html %]' is not a valid comment type.
 
-  [% ELSIF error == "db_error" %]
-    An error occurred while performing a database operation:
-    <pre>[% err_message FILTER html %]</pre>
-
   [% ELSIF error == "db_rename_conflict" %]
     Name conflict: Cannot rename [% old FILTER html %] to
     [%+ new FILTER html %] because [% new FILTER html %] already exists.