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 "Normalize dir path in AutoLoaderStructureTest"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialPrefixindex.php
diff --git
a/includes/specials/SpecialPrefixindex.php
b/includes/specials/SpecialPrefixindex.php
index
fac71b2
..
f7906db
100644
(file)
--- a/
includes/specials/SpecialPrefixindex.php
+++ b/
includes/specials/SpecialPrefixindex.php
@@
-48,8
+48,6
@@
class SpecialPrefixindex extends SpecialAllPages {
* @param string $par Becomes "FOO" when called like Special:Prefixindex/FOO (default null)
*/
function execute( $par ) {
* @param string $par Becomes "FOO" when called like Special:Prefixindex/FOO (default null)
*/
function execute( $par ) {
- global $wgContLang;
-
$this->setHeaders();
$this->outputHeader();
$this->setHeaders();
$this->outputHeader();
@@
-65,7
+63,7
@@
class SpecialPrefixindex extends SpecialAllPages {
$this->hideRedirects = $request->getBool( 'hideredirects', $this->hideRedirects );
$this->stripPrefix = $request->getBool( 'stripprefix', $this->stripPrefix );
$this->hideRedirects = $request->getBool( 'hideredirects', $this->hideRedirects );
$this->stripPrefix = $request->getBool( 'stripprefix', $this->stripPrefix );
- $namespaces =
$wgContLang
->getNamespaces();
+ $namespaces =
MediaWikiServices::getInstance()->getContentLanguage()
->getNamespaces();
$out->setPageTitle(
( $namespace > 0 && array_key_exists( $namespace, $namespaces ) )
? $this->msg( 'prefixindex-namespace', str_replace( '_', ' ', $namespaces[$namespace] ) )
$out->setPageTitle(
( $namespace > 0 && array_key_exists( $namespace, $namespaces ) )
? $this->msg( 'prefixindex-namespace', str_replace( '_', ' ', $namespaces[$namespace] ) )
@@
-102,8
+100,10
@@
class SpecialPrefixindex extends SpecialAllPages {
'prefix' => [
'label-message' => 'allpagesprefix',
'name' => 'prefix',
'prefix' => [
'label-message' => 'allpagesprefix',
'name' => 'prefix',
+ 'id' => 'nsfrom',
'type' => 'text',
'size' => '30',
'type' => 'text',
'size' => '30',
+ 'default' => str_replace( '_', ' ', $from ),
],
'namespace' => [
'type' => 'namespaceselect',
],
'namespace' => [
'type' => 'namespaceselect',
@@
-111,7
+111,7
@@
class SpecialPrefixindex extends SpecialAllPages {
'id' => 'namespace',
'label-message' => 'namespace',
'all' => null,
'id' => 'namespace',
'label-message' => 'namespace',
'all' => null,
- '
value
' => $namespace,
+ '
default
' => $namespace,
],
'hidedirects' => [
'class' => 'HTMLCheckField',
],
'hidedirects' => [
'class' => 'HTMLCheckField',
@@
-124,7
+124,9
@@
class SpecialPrefixindex extends SpecialAllPages {
'label-message' => 'prefixindex-strip',
],
];
'label-message' => 'prefixindex-strip',
],
];
- $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() );
+ $context = new DerivativeContext( $this->getContext() );
+ $context->setTitle( $this->getPageTitle() ); // Remove subpage
+ $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $context );
$htmlForm
->setMethod( 'get' )
->setWrapperLegendMsg( 'prefixindex' )
$htmlForm
->setMethod( 'get' )
->setWrapperLegendMsg( 'prefixindex' )
@@
-134,20
+136,18
@@
class SpecialPrefixindex extends SpecialAllPages {
}
/**
}
/**
- * @param int $namespace
Default NS_MAIN
+ * @param int $namespace
* @param string $prefix
* @param string $prefix
- * @param string $from List all pages from this name (default false)
+ * @param string
|null
$from List all pages from this name (default false)
*/
*/
- protected function showPrefixChunk( $namespace = NS_MAIN, $prefix, $from = null ) {
- global $wgContLang;
-
+ protected function showPrefixChunk( $namespace, $prefix, $from = null ) {
if ( $from === null ) {
$from = $prefix;
}
$fromList = $this->getNamespaceKeyAndText( $namespace, $from );
$prefixList = $this->getNamespaceKeyAndText( $namespace, $prefix );
if ( $from === null ) {
$from = $prefix;
}
$fromList = $this->getNamespaceKeyAndText( $namespace, $from );
$prefixList = $this->getNamespaceKeyAndText( $namespace, $prefix );
- $namespaces =
$wgContLang
->getNamespaces();
+ $namespaces =
MediaWikiServices::getInstance()->getContentLanguage()
->getNamespaces();
$res = null;
$n = 0;
$nextRow = null;
$res = null;
$n = 0;
$nextRow = null;