dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Perform input validation for file $page at some strategic locations"
[lhc/web/wiklou.git]
/
maintenance
/
namespaceDupes.php
diff --git
a/maintenance/namespaceDupes.php
b/maintenance/namespaceDupes.php
index
522871d
..
0bd627f
100644
(file)
--- a/
maintenance/namespaceDupes.php
+++ b/
maintenance/namespaceDupes.php
@@
-24,10
+24,12
@@
* @ingroup Maintenance
*/
* @ingroup Maintenance
*/
+require_once __DIR__ . '/Maintenance.php';
+
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
-
-
require_once __DIR__ . '/Maintenance.php'
;
+use Wikimedia\Rdbms\ResultWrapper;
+
use Wikimedia\Rdbms\IMaintainableDatabase
;
/**
* Maintenance script that checks for articles to fix after
/**
* Maintenance script that checks for articles to fix after
@@
-38,7
+40,7
@@
require_once __DIR__ . '/Maintenance.php';
class NamespaceConflictChecker extends Maintenance {
/**
class NamespaceConflictChecker extends Maintenance {
/**
- * @var Database
+ * @var
IMaintainable
Database
*/
protected $db;
*/
protected $db;
@@
-571,7
+573,7
@@
class NamespaceConflictChecker extends Maintenance {
/**
* Merge page histories
*
/**
* Merge page histories
*
- * @param
integer $id The page_id
+ * @param
stdClass $row Page row
* @param Title $newTitle The new title
* @return bool
*/
* @param Title $newTitle The new title
* @return bool
*/