X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmail%2FUserMailer.php;h=47fa16f87fd0da278cfcaf47c611845423430128;hb=543c5c1a1f985f3107ad1172933770bb761e54cf;hp=63a3eb03eb21c570de98f868e9e3937d0d77aa66;hpb=c4e35c216d4036cc7f19e499e214278d9572da52;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 63a3eb03eb..47fa16f87f 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -64,7 +64,7 @@ class UserMailer {
 	 *
 	 * @return string
 	 */
-	static function arrayToHeaderString( $headers, $endl = PHP_EOL ) {
+	private static function arrayToHeaderString( $headers, $endl = PHP_EOL ) {
 		$strings = [];
 		foreach ( $headers as $name => $value ) {
 			// Prevent header injection by stripping newlines from value
@@ -79,10 +79,10 @@ class UserMailer {
 	 *
 	 * @return string
 	 */
-	static function makeMsgId() {
+	private static function makeMsgId() {
 		global $wgSMTP, $wgServer;
 
-		$domainId = WikiMap::getCurrentWikiDomain()->getId();
+		$domainId = WikiMap::getCurrentWikiDbDomain()->getId();
 		$msgid = uniqid( $domainId . ".", true /** for cygwin */ );
 		if ( is_array( $wgSMTP ) && isset( $wgSMTP['IDHost'] ) && $wgSMTP['IDHost'] ) {
 			$domain = $wgSMTP['IDHost'];
@@ -465,7 +465,7 @@ class UserMailer {
 	 * @param int $code Error number
 	 * @param string $string Error message
 	 */
-	static function errorHandler( $code, $string ) {
+	private static function errorHandler( $code, $string ) {
 		self::$mErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
 	}