From 67ff372dc122ba876192307b5a1ddf7b9d143773 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 19 Jun 2013 17:21:11 +0800
Subject: revert accidental commits

---
 .htaccess                               | 1 -
 Bugzilla.pm                             | 2 +-
 template/en/default/list/list.html.tmpl | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index b437fc9d0..1b5f961d2 100644
--- a/.htaccess
+++ b/.htaccess
@@ -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>
-- 
cgit v1.2.3-24-g4f1b