Backout bug 1089475, it causes deep recursions when the DB server is not accessible
git-svn-id: svn://10.0.0.236/trunk@265910 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
8a5d06fe60
commit
75cf9cff5e
@ -1 +1 @@
|
||||
9364
|
||||
9365
|
||||
@ -1 +1 @@
|
||||
721ce1638ad8e613efec8aff3ed3ca0110ad08e3
|
||||
e6d2fb75aa3c183323c534a214f3dd9be5638676
|
||||
@ -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
|
||||
}
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user