From 4b5c01369d321706117d2c2a75ca8e221fc396e6 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Fri, 16 Jun 2006 14:20:17 +0000
Subject: [PATCH] Use standard linker functions to make user and tool links;
 fixes a bizarre blip I've just noticed on a local install.

---
 includes/ImagePage.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index fc1f1a6b24..8a5e166ba3 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -700,19 +700,14 @@ class ImageHistoryList {
 				$dlink = $del;
 			}
 		}
-		if ( 0 == $user ) {
-			$userlink = $usertext;
-		} else {
-			$userlink = $this->skin->makeLinkObj( Title::makeTitle( NS_USER, $usertext ), $usertext );
-			$usertalk = $this->skin->makeLinkObj( Title::makeTitle( NS_USER_TALK, $usertext), $wgContLang->getNsText( NS_TALK ) );
-			$userdata = $userlink . ' (' . $usertalk . ')';
-		}
+		
+		$userlink = $this->skin->userLink( $user, $usertext ) . $this->skin->userToolLinks( $user, $usertext );
 		$nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
 			$wgLang->formatNum( $size ) );
 		$widthheight = wfMsg( 'widthheight', $width, $height );
 		$style = $this->skin->getInternalLinkAttributes( $url, $datetime );
 
-		$s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a> . . {$userdata} . . {$widthheight} ({$nbytes})";
+		$s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a> . . {$userlink} . . {$widthheight} ({$nbytes})";
 
 		$s .= $this->skin->commentBlock( $description, $wgTitle );
 		$s .= "</li>\n";
-- 
2.20.1