dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "User: Avoid deprecated Linker::link()"
[lhc/web/wiklou.git]
/
includes
/
user
/
User.php
diff --git
a/includes/user/User.php
b/includes/user/User.php
index
4d16594
..
a1119fa
100644
(file)
--- a/
includes/user/User.php
+++ b/
includes/user/User.php
@@
-2506,7
+2506,7
@@
class User implements IDBAccessObject {
$cache->delete( $key, 1 );
} else {
wfGetDB( DB_MASTER )->onTransactionPreCommitOrIdle(
$cache->delete( $key, 1 );
} else {
wfGetDB( DB_MASTER )->onTransactionPreCommitOrIdle(
- function() use ( $cache, $key ) {
+ function
() use ( $cache, $key ) {
$cache->delete( $key );
},
__METHOD__
$cache->delete( $key );
},
__METHOD__
@@
-3698,7
+3698,7
@@
class User implements IDBAccessObject {
}
// Try to update the DB post-send and only if needed...
}
// 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
}
if ( !$this->getNewtalk() ) {
return; // no notifications to clear
}
@@
-4957,7
+4957,8
@@
class User implements IDBAccessObject {
}
$title = UserGroupMembership::getGroupPage( $group );
if ( $title ) {
}
$title = UserGroupMembership::getGroupPage( $group );
if ( $title ) {
- return Linker::link( $title, htmlspecialchars( $text ) );
+ return MediaWikiServices::getInstance()
+ ->getLinkRenderer()->makeLink( $title, $text );
} else {
return htmlspecialchars( $text );
}
} else {
return htmlspecialchars( $text );
}