summaryrefslogtreecommitdiff
path: root/includes/Linker.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2016-05-21 08:33:14 +0200
committerPierre Schmitz <pierre@archlinux.de>2016-05-21 08:33:14 +0200
commit7bf2eb8ba09b54cec804446ea39a3e658773fac9 (patch)
tree12fa50d1d49fe0c7f9b5cff08aa88d93f5d4146f /includes/Linker.php
parentc96958a50a97382ef4ada897d1e7120d7a222a28 (diff)
Update to MediaWiki 1.26.3
Diffstat (limited to 'includes/Linker.php')
-rw-r--r--includes/Linker.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/includes/Linker.php b/includes/Linker.php
index 9b5ff27b..f0fa4a5a 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1073,7 +1073,16 @@ class Linker {
if ( !$title ) {
$title = $wgTitle;
}
- $attribs['rel'] = Parser::getExternalLinkRel( $url, $title );
+ $newRel = Parser::getExternalLinkRel( $url, $title );
+ if ( !isset( $attribs['rel'] ) || $attribs['rel'] === '' ) {
+ $attribs['rel'] = $newRel;
+ } elseif( $newRel !== '' ) {
+ // Merge the rel attributes.
+ $newRels = explode( ' ', $newRel );
+ $oldRels = explode( ' ', $attribs['rel'] );
+ $combined = array_unique( array_merge( $newRels, $oldRels ) );
+ $attribs['rel'] = implode( ' ', $combined );
+ }
$link = '';
$success = Hooks::run( 'LinkerMakeExternalLink',
array( &$url, &$text, &$link, &$attribs, $linktype ) );