diff --git a/NEWS b/NEWS index 4f7cf0b..b464a05 100644 --- a/NEWS +++ b/NEWS @@ -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) ------------------------------------------------------------------------ diff --git a/extension.json b/extension.json index bd67172..5f57b44 100644 --- a/extension.json +++ b/extension.json @@ -6,7 +6,7 @@ ], "type": "parserhook", "url": "https://www.mediawiki.org/wiki/Extension:LinkTitles", - "version": "4.0.0", + "version": "4.0.1", "license-name": "GPL-2.0+", "descriptionmsg": "linktitles-desc", "requires": { diff --git a/gh-pages b/gh-pages index ce7f578..a19a8d5 160000 --- a/gh-pages +++ b/gh-pages @@ -1 +1 @@ -Subproject commit ce7f578395d6ef3beb9360c72d46480524c9d457 +Subproject commit a19a8d5737feac3bab26dd99383e51928eb56af4 diff --git a/includes/LinkTitles_Special.php b/includes/LinkTitles_Special.php index b02e5eb..aada402 100644 --- a/includes/LinkTitles_Special.php +++ b/includes/LinkTitles_Special.php @@ -284,11 +284,7 @@ EOF /// Counts the number of pages in a read-access wiki database ($dbr). /// @param $dbr Read-only `Database` object. /// @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) { ->>>>>>> 085a4032f07ef9200370e7561b5b22b4c05e287c:SpecialLinkTitles.php $res = $dbr->select( 'page', array('pagecount' => "COUNT(page_id)"),