diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-06-19 11:21:11 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-06-19 11:21:11 +0200 |
| commit | 67ff372dc122ba876192307b5a1ddf7b9d143773 (patch) | |
| tree | 6d8e137f87d8e5cf0cd8bfcc1bcebfc02c3f2151 | |
| parent | 1df1292cdc4837810703e6ec01a7354bdf82c7a1 (diff) | |
| download | bugzilla-67ff372dc122ba876192307b5a1ddf7b9d143773.tar.gz bugzilla-67ff372dc122ba876192307b5a1ddf7b9d143773.tar.xz | |
revert accidental commits
| -rw-r--r-- | .htaccess | 1 | ||||
| -rw-r--r-- | Bugzilla.pm | 2 | ||||
| -rw-r--r-- | template/en/default/list/list.html.tmpl | 2 |
3 files changed, 2 insertions, 3 deletions
@@ -37,7 +37,6 @@ Redirect permanent /etiquette.html https://bugzilla.mozilla.org/page.cgi?id=etiq Redirect permanent /duplicates.html https://bugzilla.mozilla.org/duplicates.cgi RewriteEngine On -RewriteBase /884177/ RewriteRule ^review(.*) page.cgi?id=splinter.html$1 [QSA] RewriteRule ^favicon\.ico$ extensions/BMO/web/images/favicon.ico RewriteRule ^form[\.:](itrequest|mozlist|poweredby|presentation|trademark|recoverykey)$ enter_bug.cgi?product=mozilla.org&format=$1 diff --git a/Bugzilla.pm b/Bugzilla.pm index 29811cf76..51b6c309f 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -85,7 +85,7 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600; # Global Code ##################################################################### -$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess; +#$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess; # Note that this is a raw subroutine, not a method, so $class isn't available. sub init_page { diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 69dc28a7a..cda06ac21 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -62,7 +62,7 @@ <div class="bz_query_debug"> <p>Total execution time: [% query_time FILTER html %] seconds</p> [% FOREACH query = queries %] - <pre>[% query.sql FILTER html %]</pre> + <p>[% query.sql FILTER html %]</p> <p>Execution time: [% query.time FILTER html %] seconds</p> [% IF query.explain %] <pre>[% query.explain FILTER html %]</pre> |