From 12c3ba99e77f3105515306e8b86fd9773e0940e5 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Mon, 13 Dec 2010 18:07:40 +0000
Subject: [PATCH] MDL-25659 fixed overriding of fields variable and improved
 coding style in similar places credit goes to Bill Johnson

---
 enrol/database/lib.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/enrol/database/lib.php b/enrol/database/lib.php
index 458c2151f91..395d128b708 100644
--- a/enrol/database/lib.php
+++ b/enrol/database/lib.php
@@ -319,9 +319,9 @@ class enrol_database_plugin extends enrol_plugin {
 
         // sync enrolments
         $ignorehidden = $this->get_config('ignorehiddencourses');
-        $fields = array($userfield);
+        $sqlfields = array($userfield);
         if ($rolefield) {
-            $fields[] = $rolefield;
+            $sqlfields[] = $rolefield;
         }
         foreach ($existing as $course) {
             if ($ignorehidden and !$course->visible) {
@@ -356,7 +356,7 @@ class enrol_database_plugin extends enrol_plugin {
 
             // get list of users that need to be enrolled and their roles
             $requested_roles = array();
-            $sql = $this->db_get_sql($table, array($coursefield=>$course->mapping), $fields);
+            $sql = $this->db_get_sql($table, array($coursefield=>$course->mapping), $sqlfields);
             if ($rs = $extdb->Execute($sql)) {
                 if (!$rs->EOF) {
                     if ($localuserfield === 'username') {
@@ -488,14 +488,14 @@ class enrol_database_plugin extends enrol_plugin {
         $idnumber  = strtolower($this->get_config('newcourseidnumber'));
         $category  = strtolower($this->get_config('newcoursecategory'));
 
-        $fields = array($fullname, $shortname);
+        $sqlfields = array($fullname, $shortname);
         if ($category) {
-            $fields[] = $category;
+            $sqlfields[] = $category;
         }
         if ($idnumber) {
-            $fields[] = $idnumber;
+            $sqlfields[] = $idnumber;
         }
-        $sql = $this->db_get_sql($table, array(), $fields);
+        $sql = $this->db_get_sql($table, array(), $sqlfields);
         $createcourses = array();
         if ($rs = $extdb->Execute($sql)) {
             if (!$rs->EOF) {
-- 
2.17.1