Stopping warning and possible errors in graphlib.php caused by bugs in statsgraph.php

Ported from LDC (1.5) branch

Author: Andrew Walbran <andrew.walbran@catalyst.net.nz>

diff --git a/course/report/stats/graph.php b/course/report/stats/graph.php
index 81d2ec8a33b6d6ce82e24cd7a0800ee350e02344..18e3fc2747cfbaa620706a0b53b373d6a196a64c 100644 (file)
--- a/course/report/stats/graph.php
+++ b/course/report/stats/graph.php
@@ -73,17 +73,17 @@
                 $graph->y_data['line3'][] = $stat->line3;
             }
         }
-        $graph->y_order = array('line1','line2');
-        if (!empty($param->line3)) {
-            $graph->y_order[] = 'line3';
-        }
+        $graph->y_order = array('line1');
         $graph->y_format['line1'] = array('colour' => $c[1],'line' => 'line','legend' => $param->line1);
         if (!empty($param->line2)) {
+            $graph->y_order[] = 'line2';
             $graph->y_format['line2'] = array('colour' => $c[2],'line' => 'line','legend' => $param->line2); 
         }
         if (!empty($param->line3)) {
+            $graph->y_order[] = 'line3';
             $graph->y_format['line3'] = array('colour' => $c[3],'line' => 'line','legend' => $param->line3); 
         }
+        $graph->y_tick_labels = false;
     } else {
         $data = array();
         $times = array();