From: jenkins-bot Date: Thu, 17 Apr 2014 20:21:32 +0000 (+0000) Subject: Merge "Add 'mw-anonuserlink' class for anonymous users" X-Git-Tag: 1.31.0-rc.0~16171 X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=a8304d4c73fd04c338ae23f3028fc475921cc0fa;hp=b101f0543823f5db81b850329573a678d0e0bd94;p=lhc%2Fweb%2Fwiklou.git Merge "Add 'mw-anonuserlink' class for anonymous users" --- diff --git a/includes/Linker.php b/includes/Linker.php index c9a184cbc5..0805f70345 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1084,11 +1084,13 @@ class Linker { * @since 1.19 Method exists for a long time. $altUserName was added in 1.19. */ public static function userLink( $userId, $userName, $altUserName = false ) { + $classes = 'mw-userlink'; if ( $userId == 0 ) { $page = SpecialPage::getTitleFor( 'Contributions', $userName ); if ( $altUserName === false ) { $altUserName = IP::prettifyIP( $userName ); } + $classes .= ' mw-anonuserlink'; // Separate link class for anons (bug 43179) } else { $page = Title::makeTitle( NS_USER, $userName ); } @@ -1096,7 +1098,7 @@ class Linker { return self::link( $page, htmlspecialchars( $altUserName !== false ? $altUserName : $userName ), - array( 'class' => 'mw-userlink' ) + array( 'class' => $classes ) ); } diff --git a/tests/phpunit/includes/LinkerTest.php b/tests/phpunit/includes/LinkerTest.php index b605f08f16..351ad34433 100644 --- a/tests/phpunit/includes/LinkerTest.php +++ b/tests/phpunit/includes/LinkerTest.php @@ -28,38 +28,38 @@ class LinkerTest extends MediaWikiLangTestCase { ### ANONYMOUS USER ######################################## array( - 'JohnDoe', + 'JohnDoe', 0, 'JohnDoe', false, ), array( - '::1', + '::1', 0, '::1', false, 'Anonymous with pretty IPv6' ), array( - '::1', + '::1', 0, '0:0:0:0:0:0:0:1', false, 'Anonymous with almost pretty IPv6' ), array( - '::1', + '::1', 0, '0000:0000:0000:0000:0000:0000:0000:0001', false, 'Anonymous with full IPv6' ), array( - 'AlternativeUsername', + 'AlternativeUsername', 0, '::1', 'AlternativeUsername', 'Anonymous with pretty IPv6 and an alternative username' ), # IPV4 array( - '127.0.0.1', + '127.0.0.1', 0, '127.0.0.1', false, 'Anonymous with IPv4' ), array( - 'AlternativeUsername', + 'AlternativeUsername', 0, '127.0.0.1', 'AlternativeUsername', 'Anonymous with IPv4 and an alternative username' ),