Only run onUserSaveSettings hook if not in update.php

Depends on I57a47661f2069efb91340db8188be92d4efb23e9 in core.

Bug: 57335
Change-Id: I4cf977ee4e0dfd5c564334481e9ae2f6bca85b61
This commit is contained in:
Kunal Mehta 2013-11-20 16:31:01 -08:00
parent 1f5cf20df8
commit 9f7d409c10

View file

@ -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;
}