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 "Remove parameter 'options' from hook 'SkinEditSectionLinks'"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQuerySiteinfo.php
diff --git
a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index
68ab725
..
7e4a891
100644
(file)
--- a/
includes/api/ApiQuerySiteinfo.php
+++ b/
includes/api/ApiQuerySiteinfo.php
@@
-282,27
+282,28
@@
class ApiQuerySiteinfo extends ApiQueryBase {
$data = [
ApiResult::META_TYPE => 'assoc',
];
$data = [
ApiResult::META_TYPE => 'assoc',
];
+ $nsInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
foreach (
MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces()
as $ns => $title
) {
$data[$ns] = [
'id' => (int)$ns,
foreach (
MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces()
as $ns => $title
) {
$data[$ns] = [
'id' => (int)$ns,
- 'case' =>
MWNamespace::
isCapitalized( $ns ) ? 'first-letter' : 'case-sensitive',
+ 'case' =>
$nsInfo->
isCapitalized( $ns ) ? 'first-letter' : 'case-sensitive',
];
ApiResult::setContentValue( $data[$ns], 'name', $title );
];
ApiResult::setContentValue( $data[$ns], 'name', $title );
- $canonical =
MWNamespace::
getCanonicalName( $ns );
+ $canonical =
$nsInfo->
getCanonicalName( $ns );
- $data[$ns]['subpages'] =
MWNamespace::
hasSubpages( $ns );
+ $data[$ns]['subpages'] =
$nsInfo->
hasSubpages( $ns );
if ( $canonical ) {
$data[$ns]['canonical'] = strtr( $canonical, '_', ' ' );
}
if ( $canonical ) {
$data[$ns]['canonical'] = strtr( $canonical, '_', ' ' );
}
- $data[$ns]['content'] =
MWNamespace::
isContent( $ns );
- $data[$ns]['nonincludable'] =
MWNamespace::
isNonincludable( $ns );
+ $data[$ns]['content'] =
$nsInfo->
isContent( $ns );
+ $data[$ns]['nonincludable'] =
$nsInfo->
isNonincludable( $ns );
- $contentmodel =
MWNamespace::
getNamespaceContentModel( $ns );
+ $contentmodel =
$nsInfo->
getNamespaceContentModel( $ns );
if ( $contentmodel ) {
$data[$ns]['defaultcontentmodel'] = $contentmodel;
}
if ( $contentmodel ) {
$data[$ns]['defaultcontentmodel'] = $contentmodel;
}