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

Browse Source
This commit is contained in:
Daniel Kraus
2016-11-08 06:15:24 +01:00
parent 686005d2cc c1dc45da79
commit ac05418a09
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -1,3 +1,11 @@
Version 4.0.1 (2016-11-08)
------------------------------------------------------------------------
- FIX: Prevent syntax error when accessing special page.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 4.0.0 (2016-11-05) Version 4.0.0 (2016-11-05)
------------------------------------------------------------------------ ------------------------------------------------------------------------

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.0", "version": "4.0.1",
"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: ce7f578395...a19a8d5737

4
includes/LinkTitles_Special.php
View File

@ -284,11 +284,7 @@ EOF
/// Counts the number of pages in a read-access wiki database ($dbr). /// Counts the number of pages in a read-access wiki database ($dbr).
/// @param $dbr Read-only `Database` object. /// @param $dbr Read-only `Database` object.
/// @returns Number of pages in the default namespace (0) of the wiki. /// @returns Number of pages in the default namespace (0) of the wiki.
<<<<<<< HEAD:includes/LinkTitles_Special.php
private function countPages( &$dbr ) {
=======
private function countPages(&$dbr, $namespacesClause) { private function countPages(&$dbr, $namespacesClause) {
>>>>>>> 085a4032f07ef9200370e7561b5b22b4c05e287c:SpecialLinkTitles.php
$res = $dbr->select( $res = $dbr->select(
'page', 'page',
array('pagecount' => "COUNT(page_id)"), array('pagecount' => "COUNT(page_id)"),