Lib.php postgresql compatibly fix

graph.php $virtualscales was used uninitilized, fixed.

diff --git a/mod/survey/graph.php b/mod/survey/graph.php
index a9bf87b6964fa72cb410ddea56ef861726281e8d..821e6adb0abedee1417a126a52fd74cae9831aab 100644 (file)
--- a/mod/survey/graph.php
+++ b/mod/survey/graph.php
@@ -260,9 +260,9 @@
        }
        foreach ($qqq as $qq) {         // if any virtual, then use JUST virtual, else use JUST nonvirtual
            if ($qq->multi) {
-               if ($virtualscales && $qq->type < 0) {
+               if (!empty($virtualscales) && $qq->type < 0) {
                    $question[] = $qq;
-               } else if (!$virtualscales && $qq->type > 0) {
+               } else if (empty($virtualscales) && $qq->type > 0) {
                    $question[] = $qq;
                }
            }

diff --git a/mod/survey/lib.php b/mod/survey/lib.php
index 1805044f7a05871b578560af7d9cf008a3df3bd5..7273cb0566d0a824e469521fd7836e90a022a4f0 100644 (file)
--- a/mod/survey/lib.php
+++ b/mod/survey/lib.php
@@ -234,7 +234,7 @@ function survey_get_responses($surveyid, $groupid) {
                                    {$CFG->prefix}user AS u   $groupsdb
                              WHERE a.survey = $surveyid 
                                    AND a.userid = u.id $groupsql
-                          GROUP BY u.id, u.firstname, u.lastname
+                          GROUP BY u.id, u.firstname, u.lastname, u.picture
                           ORDER BY time ASC");
 }