From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 10 Jul 2015 07:54:40 +0000 (-0700)
Subject: Upgraded User::saveSettings logged errors to exceptions
X-Git-Tag: 1.31.0-rc.0~10766^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=ed1b8d3a0e685e5199ac564c417933890d71776b;p=lhc%2Fweb%2Fwiklou.git

Upgraded User::saveSettings logged errors to exceptions

* This gives more visibility and the error rate is not
  extreme (and mostly affects certain users due to
  usage patterns).

Change-Id: I3eae28a584e4db8ae40ae80087a97c416b3bd3e8
---

diff --git a/includes/User.php b/includes/User.php
index 63c0d37e45..005fc7d41f 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3679,12 +3679,10 @@ class User implements IDBAccessObject {
 			$this->clearSharedCache();
 			// User was changed in the meantime or loaded with stale data
 			$from = ( $this->queryFlagsUsed & self::READ_LATEST ) ? 'master' : 'slave';
-			MWExceptionHandler::logException( new MWException(
+			throw new MWException(
 				"CAS update failed on user_touched for user ID '{$this->mId}' (read from $from);" .
 				"the version of the user to be saved is older than the current version."
-			) );
-
-			return;
+			);
 		}
 
 		$this->mTouched = $newTouched;