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

diff --git a/lib/datalib.php b/lib/datalib.php
index dc575169366fe0e9b54ce6e4a777c0d21d02f13b..cb4ee1466834867d5e384f2dd3af7fabcca9d514 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -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 ");
 }
 

diff --git a/mod/chat/report.php b/mod/chat/report.php
index ddbc516bc1d08768dbfd46fc15bcaeb9c5c2ec5c..4c2c77b241d76007d61f745582e156ebe0982db1 100644 (file)
--- a/mod/chat/report.php
+++ b/mod/chat/report.php
@@ -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 {