MDL-18933 Cannot assign default value to variable passed by reference; merged from...

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 423d11a243a8b12be77c23c990cfa11a8bcd8fe2..5f77f016ffba10be3b2d01077dffcda3785e3fc6 100644 (file)
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -316,7 +316,9 @@ echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 
 // Build up an array of categories for move drop-down (by reference)
 $categories = array();
-echo $grade_edit_tree->build_html_tree($gtree->top_element, true, array(), $categories);
+$level      = 0;
+$row_count  = 0;
+echo $grade_edit_tree->build_html_tree($gtree->top_element, true, array(), $categories, $level, $row_count);
 
 echo '<div id="gradetreesubmit">';
 if (!$moving) {

diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index dbbf4e5c90b22074cfe6ed2f67d0aca8cbf027f1..56babc2b164db2d07f07063e37994e16808b5969 100755 (executable)
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -88,7 +88,7 @@ class grade_edit_tree {
      *
      * @return string HTML
      */
-    public function build_html_tree($element, $totals, $parents=array(), &$categories=array(), $level=0, &$row_count=0) {
+    public function build_html_tree($element, $totals, $parents, &$categories, $level, &$row_count) {
         global $CFG, $COURSE, $USER;
 
         $object = $element['object'];