From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 26 Dec 2011 21:03:06 +0000 (+0000)
Subject: Fix fixme on r107328, attempting to use $this in a static method
X-Git-Tag: 1.31.0-rc.0~25737
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=e50f64ae296340369f68a2a39b35069128f143d3;p=lhc%2Fweb%2Fwiklou.git

Fix fixme on r107328, attempting to use $this in a static method

Made said method non static, and updated caller
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 331ddca407..37fb66d7dd 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -224,7 +224,7 @@ class SpecialContributions extends SpecialPage {
 		$nt = $userObj->getUserPage();
 		$talk = $userObj->getTalkPage();
 		if ( $talk ) {
-			$tools = self::getUserLinks( $nt, $talk, $userObj, $this->getUser() );
+			$tools = $this->getUserLinks( $nt, $talk, $userObj, $this->getUser() );
 			$links = $this->getLanguage()->pipeList( $tools );
 
 			// Show a note if the user is blocked and display the last block log entry.
@@ -270,7 +270,7 @@ class SpecialContributions extends SpecialPage {
 	 * @param $subject User: The viewing user ($wgUser might be still checked in some cases)
 	 * @return array
 	 */
-	public static function getUserLinks( Title $userpage, Title $talkpage, User $target, User $subject ) {
+	public function getUserLinks( Title $userpage, Title $talkpage, User $target, User $subject ) {
 
 		$id = $target->getId();
 		$username = $target->getName();