From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 28 Jun 2017 12:49:55 +0000 (+0000)
Subject: Merge "User: Avoid deprecated Linker::link()"
X-Git-Tag: 1.31.0-rc.0~2855
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=c6d1ceb90a9684fa0da758d88ba1e994fad4cffc;hp=-c

Merge "User: Avoid deprecated Linker::link()"
---

c6d1ceb90a9684fa0da758d88ba1e994fad4cffc
diff --combined includes/user/User.php
index 52c14f7c54,86c88a95e1..a1119fafc4
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@@ -2506,7 -2506,7 +2506,7 @@@ class User implements IDBAccessObject 
  			$cache->delete( $key, 1 );
  		} else {
  			wfGetDB( DB_MASTER )->onTransactionPreCommitOrIdle(
 -				function() use ( $cache, $key ) {
 +				function () use ( $cache, $key ) {
  					$cache->delete( $key );
  				},
  				__METHOD__
@@@ -3698,7 -3698,7 +3698,7 @@@
  			}
  
  			// Try to update the DB post-send and only if needed...
 -			DeferredUpdates::addCallableUpdate( function() use ( $title, $oldid ) {
 +			DeferredUpdates::addCallableUpdate( function () use ( $title, $oldid ) {
  				if ( !$this->getNewtalk() ) {
  					return; // no notifications to clear
  				}
@@@ -4957,7 -4957,8 +4957,8 @@@
  		}
  		$title = UserGroupMembership::getGroupPage( $group );
  		if ( $title ) {
- 			return Linker::link( $title, htmlspecialchars( $text ) );
+ 			return MediaWikiServices::getInstance()
+ 				->getLinkRenderer()->makeLink( $title, $text );
  		} else {
  			return htmlspecialchars( $text );
  		}