fixed warnings/errors in latest PHP versions; merge from MOODLE_15_ST…

…ABLE
janschrage · Oct 30, 2005 · 454727f · 454727f
1 parent 7fa92da
commit 454727f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/course/groups.php b/course/groups.php
@@ -185,7 +185,7 @@
     natcasesort($nonmembers);
 
     if (empty($selectedgroup)) {    // Choose the first group by default
-        if ($selectedgroup = array_shift(array_keys($listgroups))) {
+        if ($selectedgroup = array_shift($temparr = array_keys($listgroups))) {
             $members = $listmembers[$selectedgroup];
         }
     } else {

diff --git a/grade/exceptions.php b/grade/exceptions.php
@@ -125,10 +125,7 @@
     }
 
     if (empty($selectedgrade_item)) {    // Choose the first group by default
-        // doesn't work with php 5 :(
-        // $selectedgrade_item = array_shift(array_keys($listgrade_items));
-        $keys = array_keys($listgrade_items);
-        $selectedgrade_item = array_shift($keys);
+        $selectedgrade_item = array_shift($temparr = array_keys($listgrade_items));
     }
 
     include('exceptions.html');

diff --git a/login/signup.php b/login/signup.php
@@ -53,7 +53,7 @@
     }
 
     if (!empty($err)) {
-        $focus = "form.".array_shift(array_flip(get_object_vars($err)));
+        $focus = "form.".array_shift($temparr = array_flip(get_object_vars($err)));
     } else {
         $focus = "";
     }