L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from MOODLE_14_STABLE: More small sql tweaks to avoid invalid postgres sql

Browse Source
This commit is contained in:
mjollnir_
2004-11-23 02:05:47 +00:00
parent df7ebd69ab
commit 1604a0fc2b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/datalib.php
+4 -4
View File
@@ -2648,10 +2648,10 @@ function get_logs_usercourse($userid, $courseid, $coursestart) {
$courseselect = '';
}
return get_records_sql("SELECT floor((`time` - $coursestart)/". DAYSECS .") as day, count(*) as num
return get_records_sql("SELECT floor((time - $coursestart)/". DAYSECS .") as day, count(*) as num
FROM {$CFG->prefix}log
WHERE userid = '$userid'
AND `time` > '$coursestart' $courseselect
AND time > '$coursestart' $courseselect
GROUP BY day ");
}
@@ -2675,10 +2675,10 @@ function get_logs_userday($userid, $courseid, $daystart) {
$courseselect = '';
}
return get_records_sql("SELECT floor((`time` - $daystart)/". HOURSECS .") as hour, count(*) as num
return get_records_sql("SELECT floor((time - $daystart)/". HOURSECS .") as hour, count(*) as num
FROM {$CFG->prefix}log
WHERE userid = '$userid'
AND `time` > '$daystart' $courseselect
AND time > '$daystart' $courseselect
GROUP BY hour ");
}
mod/chat/report.php
+2 -2
View File
@@ -44,7 +44,7 @@
if ($start and $end and !$confirmdelete) { // Show a full transcript
if ($groupid) {
if (!empty($groupid)) {
$groupselect = " AND groupid = '$currentgroup'";
$groupparam = "&groupid=$currentgroup";
} else {
@@ -106,7 +106,7 @@
$currentgroup = false;
}
if ($currentgroup) {
if (!empty($currentgroup)) {
$groupselect = " AND groupid = '$currentgroup'";
$groupparam = "&groupid=$currentgroup";
} else {