From 9f7d409c1006b59a88f901038351f86682271d95 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Wed, 20 Nov 2013 16:31:01 -0800
Subject: [PATCH] Only run onUserSaveSettings hook if not in update.php

Depends on I57a47661f2069efb91340db8188be92d4efb23e9 in core.

Bug: 57335
Change-Id: I4cf977ee4e0dfd5c564334481e9ae2f6bca85b61
---
 Hooks.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Hooks.php b/Hooks.php
index 758a1c58f..722732865 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -813,10 +813,14 @@ class EchoHooks {
 	 * @return bool true in all cases
 	 */
 	static function onUserSaveSettings( $user ) {
-		// Reset the notification count since it may have changed due to user
-		// option changes. This covers both explicit changes in the preferences
-		// and changes made through the options API (since both call this hook).
-		MWEchoNotifUser::newFromUser( $user )->resetNotificationCount();
+		// Extensions like AbuseFilter might create an account, but
+		// the tables we need might not exist. Bug 57335
+		if ( !defined( 'MW_UPDATER' ) ) {
+			// Reset the notification count since it may have changed due to user
+			// option changes. This covers both explicit changes in the preferences
+			// and changes made through the options API (since both call this hook).
+			MWEchoNotifUser::newFromUser( $user )->resetNotificationCount();
+		}
 		return true;
 	}