Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle

diff --git a/enrol/database/lib.php b/enrol/database/lib.php
index 214c70a..5a88859 100644 (file)
--- a/enrol/database/lib.php
+++ b/enrol/database/lib.php
@@ -42,7 +42,7 @@ class enrol_database_plugin extends enrol_plugin {
         if (!enrol_is_enabled('database')) {
             return true;
         }
-        if (!$this->get_config('dbtype') or !$this->get_config('dbhost') or !$this->get_config('remoteenroltable') or !$this->get_config('remotecoursefield') or !$this->get_config('remoteuserfield')) {
+        if (!$this->get_config('dbtype') or !$this->get_config('remoteenroltable') or !$this->get_config('remotecoursefield') or !$this->get_config('remoteuserfield')) {
             return true;
         }
 
@@ -98,7 +98,7 @@ class enrol_database_plugin extends enrol_plugin {
         global $CFG, $DB;
 
         // We do not create courses here intentionally because it requires full sync and is slow.
-        if (!$this->get_config('dbtype') or !$this->get_config('dbhost') or !$this->get_config('remoteenroltable') or !$this->get_config('remotecoursefield') or !$this->get_config('remoteuserfield')) {
+        if (!$this->get_config('dbtype') or !$this->get_config('remoteenroltable') or !$this->get_config('remotecoursefield') or !$this->get_config('remoteuserfield')) {
             return;
         }
 
@@ -292,7 +292,7 @@ class enrol_database_plugin extends enrol_plugin {
         global $CFG, $DB;
 
         // We do not create courses here intentionally because it requires full sync and is slow.
-        if (!$this->get_config('dbtype') or !$this->get_config('dbhost') or !$this->get_config('remoteenroltable') or !$this->get_config('remotecoursefield') or !$this->get_config('remoteuserfield')) {
+        if (!$this->get_config('dbtype') or !$this->get_config('remoteenroltable') or !$this->get_config('remotecoursefield') or !$this->get_config('remoteuserfield')) {
             $trace->output('User enrolment synchronisation skipped.');
             $trace->finished();
             return 0;
@@ -616,7 +616,7 @@ class enrol_database_plugin extends enrol_plugin {
         global $CFG, $DB;
 
         // Make sure we sync either enrolments or courses.
-        if (!$this->get_config('dbtype') or !$this->get_config('dbhost') or !$this->get_config('newcoursetable') or !$this->get_config('newcoursefullname') or !$this->get_config('newcourseshortname')) {
+        if (!$this->get_config('dbtype') or !$this->get_config('newcoursetable') or !$this->get_config('newcoursefullname') or !$this->get_config('newcourseshortname')) {
             $trace->output('Course synchronisation skipped.');
             $trace->finished();
             return 0;