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.6'

Browse Source
This commit is contained in:
Daniel Kraus
2016-12-28 12:57:41 +01:00
parent deef389e6f 20937c20d0
commit bfee9b9687
5 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -1,3 +1,11 @@
Version 4.0.6 (2016-12-28)
------------------------------------------------------------------------
- Fix: Custom namespace weights were not respected.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 4.0.5 (2016-12-14) Version 4.0.5 (2016-12-14)
------------------------------------------------------------------------ ------------------------------------------------------------------------

10
README.md
View File

@ -13,7 +13,14 @@ pages](http://bovender.github.io/LinkTitles).
This extension is [semantically versioned](http://semver.org). This extension is [semantically versioned](http://semver.org).
If you wish to contribute, please issue pull requests against the `develop` branch.
Contributing
------------
If you wish to contribute, please issue pull requests against the `develop`
branch, as I follow Vincent Driessen's advice on [A successful Git branching
model](http://nvie.com/git-model) (knowing that there are [alternative
workflows](http://scottchacon.com/2011/08/31/github-flow.html)).
Contributors Contributors
@ -21,3 +28,4 @@ Contributors
- Daniel Kraus (@bovender), main developer - Daniel Kraus (@bovender), main developer
- Ulrich Strauss (@c0nnex), namespaces - Ulrich Strauss (@c0nnex), namespaces
- Brent Laabs (@labster), bug fixes

5
extension.json
View File

@ -2,11 +2,12 @@
"name": "LinkTitles", "name": "LinkTitles",
"author": [ "author": [
"[https://www.mediawiki.org/wiki/User:Bovender Daniel Kraus (bovender)]", "[https://www.mediawiki.org/wiki/User:Bovender Daniel Kraus (bovender)]",
"Ulrich Strauss (c0nnex)" "Ulrich Strauss (c0nnex)",
"Brent Laabs (labster)"
], ],
"type": "parserhook", "type": "parserhook",
"url": "https://www.mediawiki.org/wiki/Extension:LinkTitles", "url": "https://www.mediawiki.org/wiki/Extension:LinkTitles",
"version": "4.0.5", "version": "4.0.6",
"license-name": "GPL-2.0+", "license-name": "GPL-2.0+",
"descriptionmsg": "linktitles-desc", "descriptionmsg": "linktitles-desc",
"requires": { "requires": {

2
gh-pages

Submodule gh-pages updated: fe99cf4e03...47356620d1

8
includes/LinkTitles_Extension.php
View File

@ -130,7 +130,7 @@ class Extension {
// Build a blacklist of pages that are not supposed to be link // Build a blacklist of pages that are not supposed to be link
// targets. This includes the current page. // targets. This includes the current page.
$blackList = str_replace( '_', ' ', $blackList = str_replace( ' ', '_',
'("' . implode( '","',$wgLinkTitlesBlackList ) . '","' . '("' . implode( '","',$wgLinkTitlesBlackList ) . '","' .
addslashes( self::$currentTitle->getDbKey() ) . '")' ); addslashes( self::$currentTitle->getDbKey() ) . '")' );
@ -148,7 +148,7 @@ class Extension {
$weightSelect = $weightSelect . " WHEN " . $namspacevalue . " THEN " . $currentWeight . PHP_EOL; $weightSelect = $weightSelect . " WHEN " . $namspacevalue . " THEN " . $currentWeight . PHP_EOL;
} }
$weightSelect = $weightSelect . " END "; $weightSelect = $weightSelect . " END ";
$namespacesClause = str_replace( '_', ' ','(' . implode( ', ',$namespaces ) . ')' ); $namespacesClause = '(' . implode( ', ', $namespaces ) . ')';
// Build an SQL query and fetch all page titles ordered by length from // Build an SQL query and fetch all page titles ordered by length from
// shortest to longest. Only titles from 'normal' pages (namespace uid // shortest to longest. Only titles from 'normal' pages (namespace uid
@ -165,7 +165,7 @@ class Extension {
'page_title NOT IN ' . $blackList, 'page_title NOT IN ' . $blackList,
), ),
__METHOD__, __METHOD__,
array( 'ORDER BY' => 'CHAR_LENGTH(page_title) ' . $sort_order ) array( 'ORDER BY' => 'weight ASC, CHAR_LENGTH(page_title) ' . $sort_order )
); );
} catch (Exception $e) { } catch (Exception $e) {
$res = $dbr->select( $res = $dbr->select(
@ -177,7 +177,7 @@ class Extension {
'page_title NOT IN ' . $blackList, 'page_title NOT IN ' . $blackList,
), ),
__METHOD__, __METHOD__,
array( 'ORDER BY' => 'LENGTH(page_title) ' . $sort_order ) array( 'ORDER BY' => 'weight ASC, LENGTH(page_title) ' . $sort_order )
); );
} }