- bug 107 fixed: crash when logging visit on a category containing "'"

character. Correction reported from branch 1.4

- bug fixed: in admin/stats, incorrect SQL queries gave no result.


git-svn-id: http://piwigo.org/svn/trunk@868 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2005-09-18 21:56:56 +00:00
parent 2e8a34adc7
commit b1c5e25b5e
6 changed files with 32 additions and 24 deletions
+6 -5
View File
@@ -80,8 +80,11 @@ while ( $row = mysql_fetch_array( $result ) )
$value = '';
if (isset($_GET['month']) && isset($_GET['year']) )
{
$where_clause = "DATE_FORMAT(date,'%Y-%m-%d') = '".$row['d']."'";
$value = substr($row['d'],8,2);
$where_clause = 'DAYOFMONTH(date) = '.$row['d'].'
AND MONTH(date) = '.$row['m'].'
AND YEAR(date) = '.$row['y'];
$week_day = $lang['day'][date('w', mktime(12,0,0,$row['m'],$row['d'],$row['y']))];
$value = $row['d'].' ('.$week_day.')';
}
else
{
@@ -97,12 +100,10 @@ while ( $row = mysql_fetch_array( $result ) )
// Number of pictures seen
$query = '
SELECT COUNT(*) as p,
FILE as f
SELECT COUNT(*) as p
FROM '.HISTORY_TABLE.'
WHERE '.$where_clause.'
AND FILE = \'picture\'
GROUP BY FILE
;';
$pictures = mysql_fetch_array(pwg_query( $query ));