From: Umherirrender <umherirrender_de.wp@web.de>
Date: Sun, 30 Sep 2018 13:22:29 +0000 (+0200)
Subject: Fix caller name in User::addToDatabase
X-Git-Tag: 1.34.0-rc.0~3956
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=2af5b6b08628d468ccda80017457994dacbbe295;p=lhc%2Fweb%2Fwiklou.git

Fix caller name in User::addToDatabase

Seeing {closure} in the logs as caller is not helpful

Change-Id: I876877046ae4bd1756c13e04892c1381904566de
---

diff --git a/includes/user/User.php b/includes/user/User.php
index c9fe959628..89fd99cb55 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4389,7 +4389,7 @@ class User implements IDBAccessObject, UserIdentity {
 					'user',
 					'user_id',
 					[ 'user_name' => $this->mName ],
-					__METHOD__,
+					$fname,
 					[ 'LOCK IN SHARE MODE' ]
 				);
 				$loaded = false;
@@ -4399,7 +4399,7 @@ class User implements IDBAccessObject, UserIdentity {
 					}
 				}
 				if ( !$loaded ) {
-					throw new MWException( __METHOD__ . ": hit a key conflict attempting " .
+					throw new MWException( $fname . ": hit a key conflict attempting " .
 						"to insert user '{$this->mName}' row, but it was not present in select!" );
 				}
 				return Status::newFatal( 'userexists' );