Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@265910 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2015-04-08 13:45:50 +00:00
parent 8a5d06fe60
commit 75cf9cff5e
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9364 9365

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
721ce1638ad8e613efec8aff3ed3ca0110ad08e3 e6d2fb75aa3c183323c534a214f3dd9be5638676

5
mozilla/webtools/bugzilla/Bugzilla/DB.pm
View File

@ -142,11 +142,6 @@ sub _handle_error {
$_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000) $_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000)
if length($_[0]) > 4000; if length($_[0]) > 4000;
$_[0] = Carp::longmess($_[0]); $_[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 return 0; # Now let DBI handle raising the error
} }

4
mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
View File

@ -104,10 +104,6 @@
[% ELSIF error == "comment_type_invalid" %] [% ELSIF error == "comment_type_invalid" %]
'[% type FILTER html %]' is not a valid comment type. '[% 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" %] [% ELSIF error == "db_rename_conflict" %]
Name conflict: Cannot rename [% old FILTER html %] to Name conflict: Cannot rename [% old FILTER html %] to
[%+ new FILTER html %] because [% new FILTER html %] already exists. [%+ new FILTER html %] because [% new FILTER html %] already exists.