diocloid/LinkTitles
1
0
Fork 0
mirror of https://github.com/diocloid/LinkTitles.git synced 2025-07-13 17:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-4.0.4'

Browse Source
This commit is contained in:
Daniel Kraus
2016-11-30 06:11:38 +01:00
parent ba839cbbe6 6c4db6df5a
commit 4c77baf2f1
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -1,3 +1,11 @@
Version 4.0.4 (2016-11-30)
------------------------------------------------------------------------
- Fix: Do not link titles twice if $wgLinkTitlesFirstOnly and $wgLinkTitlesSmartMode are both true.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 4.0.3 (2016-11-22) Version 4.0.3 (2016-11-22)
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
extension.json
View File

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

9
includes/LinkTitles_Extension.php
View File

@ -123,6 +123,8 @@ class Extension {
( $wgLinkTitlesPreferShortTitles ) ? $sort_order = 'ASC' : $sort_order = 'DESC'; ( $wgLinkTitlesPreferShortTitles ) ? $sort_order = 'ASC' : $sort_order = 'DESC';
( $wgLinkTitlesFirstOnly ) ? $limit = 1 : $limit = -1; ( $wgLinkTitlesFirstOnly ) ? $limit = 1 : $limit = -1;
$limitReached = false;
error_log($wgLinkTitlesFirstOnly);
self::$currentTitle = $title; self::$currentTitle = $title;
$newText = $text; $newText = $text;
@ -214,7 +216,8 @@ class Extension {
// even indexes will point to text that is not enclosed by brackets // even indexes will point to text that is not enclosed by brackets
$arr[$i] = preg_replace_callback( $regex, $arr[$i] = preg_replace_callback( $regex,
'LinkTitles\Extension::simpleModeCallback', $arr[$i], $limit, $count ); 'LinkTitles\Extension::simpleModeCallback', $arr[$i], $limit, $count );
if (( $limit >= 0 ) && ( $count > 0 )) { if ( $wgLinkTitlesFirstOnly && ( $count > 0 ) ) {
$limitReached = true;
break; break;
}; };
}; };
@ -223,7 +226,7 @@ class Extension {
// If smart mode is turned on, the extension will perform a second // If smart mode is turned on, the extension will perform a second
// pass on the page and add links with aliases where the case does // pass on the page and add links with aliases where the case does
// not match. // not match.
if ($wgLinkTitlesSmartMode) { if ( $wgLinkTitlesSmartMode && !$limitReached ) {
$arr = preg_split( self::$delimiter, $newText, -1, PREG_SPLIT_DELIM_CAPTURE ); $arr = preg_split( self::$delimiter, $newText, -1, PREG_SPLIT_DELIM_CAPTURE );
for ( $i = 0; $i < count( $arr ); $i+=2 ) { for ( $i = 0; $i < count( $arr ); $i+=2 ) {
@ -232,7 +235,7 @@ class Extension {
self::$wordStartDelim . '(' . $quotedTitle . ')' . self::$wordStartDelim . '(' . $quotedTitle . ')' .
self::$wordEndDelim . '/iS', 'LinkTitles\Extension::smartModeCallback', self::$wordEndDelim . '/iS', 'LinkTitles\Extension::smartModeCallback',
$arr[$i], $limit, $count ); $arr[$i], $limit, $count );
if (( $limit >= 0 ) && ( $count > 0 )) { if ( $wgLinkTitlesFirstOnly && ( $count > 0 )) {
break; break;
}; };
}; };