r48988 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r48987‎ | r48988 | r48989 >
Date:11:01, 29 March 2009
Author:catrope
Status:ok
Tags:
Comment:
CentralAuth: Fix regression from r48971, breaking core userrights logging when CentralAuth is installed
Modified paths:
  • /trunk/extensions/CentralAuth/CentralAuthHooks.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CentralAuth/CentralAuthHooks.php
@@ -534,8 +534,13 @@
535535 }
536536
537537 static function onUserRightsLogEntry( $user, $oldGroups, $newGroups, $reason ) {
538 - SpecialGlobalGroupMembership::addLogEntry( $user, $oldGroups,
539 - $newGroups, $reason );
540 - return false;
 538+ // Ugly hack for detecting whether we were called by core
 539+ // userrights or ours
 540+ if( $user instanceof CentralAuthGroupMembershipProxy ) {
 541+ SpecialGlobalGroupMembership::addLogEntry( $user,
 542+ $oldGroups, $newGroups, $reason );
 543+ return false;
 544+ }
 545+ return true;
541546 }
542547 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r48971Followup to r48970: apply userrights changes to CentralAuthcatrope19:15, 28 March 2009

Status & tagging log