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 "Update phpCharToUpper.json based on current differences"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialShortpages.php
diff --git
a/includes/specials/SpecialShortpages.php
b/includes/specials/SpecialShortpages.php
index
f980e71
..
94da25d
100644
(file)
--- a/
includes/specials/SpecialShortpages.php
+++ b/
includes/specials/SpecialShortpages.php
@@
-21,7
+21,8
@@
* @ingroup SpecialPage
*/
* @ingroup SpecialPage
*/
-use Wikimedia\Rdbms\ResultWrapper;
+use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\IResultWrapper;
use Wikimedia\Rdbms\IDatabase;
/**
use Wikimedia\Rdbms\IDatabase;
/**
@@
-41,9
+42,14
@@
class ShortPagesPage extends QueryPage {
}
public function getQueryInfo() {
}
public function getQueryInfo() {
+ $config = $this->getConfig();
+ $blacklist = $config->get( 'ShortPagesNamespaceBlacklist' );
$tables = [ 'page' ];
$conds = [
$tables = [ 'page' ];
$conds = [
- 'page_namespace' => MWNamespace::getContentNamespaces(),
+ 'page_namespace' => array_diff(
+ MediaWikiServices::getInstance()->getNamespaceInfo()->getContentNamespaces(),
+ $blacklist
+ ),
'page_is_redirect' => 0
];
$joinConds = [];
'page_is_redirect' => 0
];
$joinConds = [];
@@
-122,7
+128,7
@@
class ShortPagesPage extends QueryPage {
/**
* @param IDatabase $db
/**
* @param IDatabase $db
- * @param ResultWrapper $res
+ * @param
I
ResultWrapper $res
*/
function preprocessResults( $db, $res ) {
$this->executeLBFromResultWrapper( $res );
*/
function preprocessResults( $db, $res ) {
$this->executeLBFromResultWrapper( $res );