merge branch 1.5 r1010:1011 into BSF:

- bug 268 fixed: display debug content correctly git-svn-id: http://piwigo.org/svn/trunk@1012 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jan 21, 2006 · 02f08d3 · 02f08d3
1 parent 0b28c9d
commit 02f08d3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/include/functions.inc.php b/include/functions.inc.php
@@ -430,7 +430,7 @@ function format_date($date, $type = 'us', $show_time = false)
 
 function pwg_query($query)
 {
-  global $conf,$page;
+  global $conf,$page,$debug;
 
   $start = get_moment();
   $result = mysql_query($query) or my_error($query."\n");
@@ -452,12 +452,12 @@ function pwg_query($query)
     $output.= '<pre>['.$page['count_queries'].'] ';
     $output.= "\n".$query;
     $output.= "\n".'(this query time : ';
-    $output.= number_format($time, 3, '.', ' ').' s)</b>';
+    $output.= '<b>'.number_format($time, 3, '.', ' ').' s)</b>';
     $output.= "\n".'(total SQL time  : ';
     $output.= number_format($page['queries_time'], 3, '.', ' ').' s)';
-    $output.= '</pre>';
+    $output.= "</pre>\n";
 
-    echo $output;
+    $debug .= $output;
   }
 
   return $result;
@@ -471,9 +471,10 @@ function pwg_debug( $string )
   $now2 = explode( '.', $now[0] );
   $now2 = $now[1].'.'.$now2[1];
   $time = number_format( $now2 - $t2, 3, '.', ' ').' s';
+  $debug .= '<p>';
   $debug.= '['.$time.', ';
   $debug.= $count_queries.' queries] : '.$string;
-  $debug.= "\n";
+  $debug.= "</p>\n";
 }
 
 /**

diff --git a/include/page_tail.php b/include/page_tail.php
@@ -54,6 +54,14 @@
           'SQL_TIME' => number_format($page['queries_time'],3,'.',' ').' s'));
 }
 
+if ($conf['show_queries']) 
+{
+  $template->assign_block_vars(
+    'debug',
+    array('QUERIES_LIST' => $debug)
+  );
+}
+
 //--------------------------------------------------------------------- contact
 
 if (!$user['is_the_guest'])

diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl
@@ -17,5 +17,8 @@
 </div> <!-- copyright -->
 </div> <!-- the_page -->
 
+<!-- BEGIN debug -->
+  {debug.QUERIES_LIST}
+<!-- END debug -->
 </body>
 </html>