adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 01:03:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge branch 1.5 r1010:1011 into BSF:

Browse Source 
- bug 268 fixed: display debug content correctly

git-svn-id: http://piwigo.org/svn/trunk@1012 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2006-01-21 20:38:29 +00:00
parent 0b28c9da75
commit 02f08d3c4f
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+6 -5
View File
@@ -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";
}
/**