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

Remove conflict markers from LinkTitles_Special.php

Browse Source 
- FIX: Prevent syntax error when accessing special page.

Closes #9.
This commit is contained in:
Daniel Kraus
2016-11-08 06:10:33 +01:00
parent ab8ecc2b0b
commit 4ff5d7aadf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)"),