Merge branch 'MDL-51242-31' of git://github.com/andrewnicols/moodle i…

…nto MOODLE_31_STABLE
moodle · Jul 25, 2016 · e764c1b · e764c1b
2 parents f8b4522 + 767eaec
commit e764c1b
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/admin/tool/messageinbound/classes/manager.php b/admin/tool/messageinbound/classes/manager.php
@@ -103,6 +103,15 @@ protected function get_imap_client() {
             'debug'    => empty($CFG->debugimap) ? null : fopen('php://stderr', 'w'),
         );
 
+        if (strpos($configuration['hostspec'], ':')) {
+            $hostdata = explode(':', $configuration['hostspec']);
+            if (count($hostdata) === 2) {
+                // A hostname in the format hostname:port has been provided.
+                $configuration['hostspec'] = $hostdata[0];
+                $configuration['port'] = $hostdata[1];
+            }
+        }
+
         $this->client = new \Horde_Imap_Client_Socket($configuration);
 
         try {