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

…nto MOODLE_27_STABLE
moodle · Feb 24, 2015 · 938d6e9 · 938d6e9
2 parents 0eaac55 + 40c809b
commit 938d6e9
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/lib/phpmailer/moodle_phpmailer.php b/lib/phpmailer/moodle_phpmailer.php
@@ -162,4 +162,22 @@ public function postSend() {
             return parent::postSend();
         }
     }
+
+    /**
+     * Get the server hostname.
+     * Returns the host part of the wwwroot.
+     *
+     * @access protected
+     * @return string
+     */
+    protected function serverHostname() {
+        global $CFG;
+
+        $hostname = parent::serverHostname();
+        if ($hostname === 'localhost.localdomain') {
+            $urlinfo = parse_url($CFG->wwwroot);
+            $hostname = $urlinfo['host'];
+        }
+        return $hostname;
+    }
 }