Fetchmode needs to be explicity set to ASSOC. Plus 1 missing library

added. MDL-7443

Merged from MOODLE_17_STABLE

diff --git a/enrol/database/enrol.php b/enrol/database/enrol.php
index 66773f0cab49e782ab4d318dc58c6c256206597a..12e966156756693d307cdbb679c79e100b6fb108 100644 (file)
--- a/enrol/database/enrol.php
+++ b/enrol/database/enrol.php
@@ -604,6 +604,7 @@ function enrol_connect() {
     // Try to connect to the external database
     $enroldb = &ADONewConnection($CFG->enrol_dbtype);
     if ($enroldb->PConnect($CFG->enrol_dbhost,$CFG->enrol_dbuser,$CFG->enrol_dbpass,$CFG->enrol_dbname)) {
+        $enroldb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
         return $enroldb;
     } else {
         // do a bit of cleanup, and lot the problem

diff --git a/enrol/database/enrol_database_sync.php b/enrol/database/enrol_database_sync.php
index 8d6effbb1ddf390a045ea214f19f06980bf33359..edeb500b48688a4b30fd8ae083511c90e03219a6 100644 (file)
--- a/enrol/database/enrol_database_sync.php
+++ b/enrol/database/enrol_database_sync.php
@@ -9,6 +9,7 @@
     require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 
     require_once($CFG->dirroot . '/course/lib.php');
+    require_once($CFG->dirroot . '/lib/blocklib.php');
     require_once($CFG->dirroot . "/enrol/database/enrol.php");
 
     // ensure errors are well explained