specials: SpecialTalkPage: Use config from request context
A special page has access to the request context which includes the site config, no need to inject that separately here. Change-Id: If8f01466c64dbacf806b6fccfa0bc4736c259607 (cherry picked from commit 0110bba7c9a8bdaf1cd8579534300c76b29c038a)
This commit is contained in:
parent
4fb27b070e
commit
bbd7861a38
3 changed files with 3 additions and 7 deletions
|
|
@ -1256,7 +1256,6 @@ class SpecialPageFactory {
|
|||
'TalkPage' => [
|
||||
'class' => SpecialTalkPage::class,
|
||||
'services' => [
|
||||
'MainConfig',
|
||||
'TitleParser',
|
||||
],
|
||||
],
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
namespace MediaWiki\Specials\Redirects;
|
||||
|
||||
use MediaWiki\Config\Config;
|
||||
use MediaWiki\HTMLForm\HTMLForm;
|
||||
use MediaWiki\MainConfigNames;
|
||||
use MediaWiki\SpecialPage\FormSpecialPage;
|
||||
|
|
@ -36,12 +35,10 @@ use MediaWiki\Title\TitleParser;
|
|||
*/
|
||||
class SpecialTalkPage extends FormSpecialPage {
|
||||
|
||||
private Config $config;
|
||||
private TitleParser $titleParser;
|
||||
|
||||
public function __construct( Config $config, TitleParser $titleParser ) {
|
||||
public function __construct( TitleParser $titleParser ) {
|
||||
parent::__construct( 'TalkPage' );
|
||||
$this->config = $config;
|
||||
$this->titleParser = $titleParser;
|
||||
}
|
||||
|
||||
|
|
@ -80,7 +77,7 @@ class SpecialTalkPage extends FormSpecialPage {
|
|||
$this->getOutput()->redirect( $talk->getFullUrlForRedirect(), '302' );
|
||||
$this->getOutput()->enableClientCache();
|
||||
$this->getOutput()->setCdnMaxage(
|
||||
$this->config->get( MainConfigNames::ParserCacheExpireTime )
|
||||
$this->getConfig()->get( MainConfigNames::ParserCacheExpireTime )
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class SpecialTalkPageTest extends MediaWikiIntegrationTestCase {
|
|||
$context->setRequest( $request );
|
||||
$context->setTitle( Title::newFromText( 'Special:TalkPage' ) );
|
||||
$context->setLanguage( $services->getLanguageFactory()->getLanguage( 'qqx' ) );
|
||||
$page = new SpecialTalkPage( $services->getMainConfig(), $services->getTitleParser() );
|
||||
$page = new SpecialTalkPage( $services->getTitleParser() );
|
||||
$page->setContext( $context );
|
||||
|
||||
$page->execute( $subpage );
|
||||
|
|
|
|||
Loading…
Reference in a new issue