From: Kunal Mehta <legoktm@gmail.com>
Date: Wed, 12 Feb 2014 05:44:34 +0000 (-0800)
Subject: Only call ->clearInstanceCache() if $targetUser instanceof User
X-Git-Tag: 1.31.0-rc.0~16944
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=74a2d73ac9054fafb654474a38f51c8638283bdd;p=lhc%2Fweb%2Fwiklou.git

Only call ->clearInstanceCache() if $targetUser instanceof User

Bug: 61252
Change-Id: Ibb79ca9a27e50b58fdd5dd541e243054fb095753
---

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index b4757e0fa1..a6b36024e8 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -152,7 +152,10 @@ class UserrightsPage extends SpecialPage {
 			}
 
 			$targetUser = $status->value;
-			$targetUser->clearInstanceCache();
+			if ( $targetUser instanceof User ) { // UserRightsProxy doesn't have this method (bug 61252)
+				$targetUser->clearInstanceCache(); // bug 38989
+			}
+
 
 			if ( $request->getVal( 'conflictcheck-originalgroups' ) !== implode( ',', $targetUser->getGroups() ) ) {
 				$out->addWikiMsg( 'userrights-conflict' );