Changeset 1011 for branches/branch-1_5/include

Timestamp:

Jan 21, 2006, 9:32:09 PM (19 years ago)

Author:

nikrou

Message:

bug 268 fixed: display debug content correctly

Location:

branches/branch-1_5/include

Files:

• functions.inc.php (modified) (3 diffs)
• page_tail.php (modified) (1 diff)

branches/branch-1_5/include/functions.inc.php

@@ -431 +431 @@
 function pwg_query($query)
 {
-  global $conf,$page;
+  global $conf,$page,$debug;
   
   $start = get_moment();
@@ -453 +453 @@
     $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;
   }
   
@@ -472 +472 @@
   $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";
 }
 

branches/branch-1_5/include/page_tail.php

@@ -55 +55 @@
 }
 
+if ($conf['show_queries']) 
+{
+  $template->assign_block_vars(
+    'debug',
+    array('QUERIES_LIST' => $debug)
+  );
+}
+
 //--------------------------------------------------------------------- contact