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 "deferred: Fix MW version number when hard deprecating to '1.34'"
[lhc/web/wiklou.git]
/
includes
/
logging
/
MergeLogFormatter.php
diff --git
a/includes/logging/MergeLogFormatter.php
b/includes/logging/MergeLogFormatter.php
index
b0edd4c
..
7a6fb9d
100644
(file)
--- a/
includes/logging/MergeLogFormatter.php
+++ b/
includes/logging/MergeLogFormatter.php
@@
-18,7
+18,7
@@
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* http://www.gnu.org/copyleft/gpl.html
*
* @file
- * @license
http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or
later
+ * @license
GPL-2.0-or-
later
* @since 1.25
*/
* @since 1.25
*/
@@
-54,9
+54,9
@@
class MergeLogFormatter extends LogFormatter {
// Show unmerge link
$params = $this->extractParameters();
// Show unmerge link
$params = $this->extractParameters();
- $revert =
Linker::linkKnown
(
+ $revert =
$this->getLinkRenderer()->makeKnownLink
(
SpecialPage::getTitleFor( 'MergeHistory' ),
SpecialPage::getTitleFor( 'MergeHistory' ),
- $this->msg( 'revertmerge' )->
escaped
(),
+ $this->msg( 'revertmerge' )->
text
(),
[],
[
'target' => $params[3],
[],
[
'target' => $params[3],