Merge branch 'release-4.0.9'

This commit is contained in:
Daniel Kraus
2017-03-21 22:19:01 +01:00
7 changed files with 77 additions and 68 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
* Copyright 2012-2016 Daniel Kraus <bovender@bovender.de> @bovender * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> @bovender
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

8
NEWS
View File

@ -1,3 +1,11 @@
Version 4.0.9 (2017-03-21)
------------------------------------------------------------------------
- Fix: __NOAUTOLINKS__ was not respected during rendering.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 4.0.8 (2017-02-16) Version 4.0.8 (2017-02-16)
------------------------------------------------------------------------ ------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
@mainpage LinkTitles @mainpage LinkTitles
@author [Daniel Kraus (bovender)](http://www.mediawiki.org/wiki/User:Bovender) @author [Daniel Kraus (bovender)](http://www.mediawiki.org/wiki/User:Bovender)
@date 2012-2016 @date 2012-2017
@copyright [GNU GPL v2+](http://www.gnu.org/licenses/gpl-2.0.html) @copyright [GNU GPL v2+](http://www.gnu.org/licenses/gpl-2.0.html)
%LinkTitles source code documentation %LinkTitles source code documentation

View File

@ -7,7 +7,7 @@
], ],
"type": "parserhook", "type": "parserhook",
"url": "https://www.mediawiki.org/wiki/Extension:LinkTitles", "url": "https://www.mediawiki.org/wiki/Extension:LinkTitles",
"version": "4.0.8", "version": "4.0.9",
"license-name": "GPL-2.0+", "license-name": "GPL-2.0+",
"descriptionmsg": "linktitles-desc", "descriptionmsg": "linktitles-desc",
"requires": { "requires": {

View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
* Copyright 2012-2016 Daniel Kraus <bovender@bovender.de> ('bovender') * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -109,7 +109,8 @@ class Extension {
// If the page contains the magic word '__NOAUTOLINKS__', do not parse it. // If the page contains the magic word '__NOAUTOLINKS__', do not parse it.
// Only process if page is in one of our namespaces we want to link // Only process if page is in one of our namespaces we want to link
if ( !isset( $parser->mDoubleUnderScores[$text] ) && in_array( $title->getNamespace(), $wgLinkTitlesNamespaces ) ) { if ( !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) &&
in_array( $title->getNamespace(), $wgLinkTitlesNamespaces ) ) {
$text = self::parseContent( $title, $text ); $text = self::parseContent( $title, $text );
} }
return true; return true;

View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
* Copyright 2012-2016 Daniel Kraus <bovender@bovender.de> ('bovender') * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
* Copyright 2012-2016 Daniel Kraus <bovender@bovender.de> ('bovender') * Copyright 2012-2017 Daniel Kraus <bovender@bovender.de> ('bovender')
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by