From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 3 May 2013 23:14:31 +0000 (-0700)
Subject: Include user name in weird User insertion exception.
X-Git-Tag: 1.31.0-rc.0~19778
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=3e7c222992c01c93fd51972ca7c86d66911184c6;p=lhc%2Fweb%2Fwiklou.git

Include user name in weird User insertion exception.

Change-Id: I70fea9819e968ae306de5c3c3eee4292d3fa17d3
---

diff --git a/includes/User.php b/includes/User.php
index 37a384cdf6..5a525bf46f 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3263,7 +3263,7 @@ class User {
 			}
 			if ( !$loaded ) {
 				throw new MWException( __METHOD__ . ": hit a key conflict attempting " .
-					"to insert a user row, but then it doesn't exist when we select it!" );
+					"to insert user '{$this->mName}' row, but it was not present in select!" );
 			}
 			return Status::newFatal( 'userexists' );
 		}