From 5ccff95a61b0c0816fa42da061c298f794daf33d Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 26 Feb 2013 15:57:37 -0500
Subject: Bug 836067 - backport bug 819432 to BMO 4.2 to improve search
 performance

---
 template/en/default/list/list.html.tmpl      | 11 +++++++----
 template/en/default/reports/report.html.tmpl |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'template')

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 055cd2e8c..cda06ac21 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -60,10 +60,13 @@
 
   [% IF debug %]
     <div class="bz_query_debug">
-      <p>[% query FILTER html %]</p>
-      <p>Execution time: [% query_time FILTER html %] seconds</p>
-      [% IF query_explain.defined %]
-        <pre>[% query_explain FILTER html %]</pre>
+      <p>Total execution time: [% query_time FILTER html %] seconds</p>
+      [% FOREACH query = queries %]
+        <p>[% query.sql FILTER html %]</p>
+        <p>Execution time: [% query.time FILTER html %] seconds</p>
+        [% IF query.explain %]
+          <pre>[% query.explain FILTER html %]</pre>
+        [% END %]
       [% END %]
     </div>
   [% END %]
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 94725ae81..38b64df0b 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -81,7 +81,9 @@
 %]
 
 [% IF debug %]
-  <p>[% query FILTER html %]</p>
+  [% FOREACH query = queries %]
+    <p>[% query.sql FILTER html %]</p>
+  [% END %]
 [% END %]
 
 <div align="center">
-- 
cgit v1.2.3-24-g4f1b