wikimedia/mediawiki-extensions-Linter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Linter synced 2024-11-11 16:59:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

SpecialLintErrors: Minor cleanup

Browse source 
* Collapse a nested conditional
* Minor copy editing

Change-Id: I2875ec0dd9c44c896cad916feb8ed1f2bd514479
This commit is contained in:
Reedy 2023-11-26 21:34:22 +00:00
parent 9c2bff933a
commit 76634af5b0
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/SpecialLintErrors.php
View file

@ -142,11 +142,9 @@ class SpecialLintErrors extends SpecialPage {
$titleNamespace = null;
}
if ( !empty( $namespaces ) && $titleNamespace !== null ) {
if ( !empty( $namespaces ) && $titleNamespace !== null && in_array( $titleNamespace, $namespaces ) === false ) {
// Show the namespace mismatch error if the namespaces specified in drop-down and title text do not match.
if ( in_array( $titleNamespace, $namespaces ) === false ) {
return [ 'titlefield' => null, 'error' => 'linter-namespace-mismatch' ];
}
return [ 'titlefield' => null, 'error' => 'linter-namespace-mismatch' ];
}
// If no namespaces are selected (null), return the namespace from the title text
@ -208,7 +206,7 @@ class SpecialLintErrors extends SpecialPage {
$exactMatch = $request->getBool( 'exactmatch', true );
$tagName = $this->getRequest()->getText( 'tag' );
// map command line tag name through associative array to protect request from a SQL injection security risk
// map command line tag name through an associative array to protect request from an SQL injection security risk
$htmlTags = new HtmlTags( $this );
$allowedHtmlTags = $htmlTags->getAllowedHTMLTags();
$tag = $allowedHtmlTags[ $tagName ] ?? 'all';
@ -216,8 +214,8 @@ class SpecialLintErrors extends SpecialPage {
// If the request contains a 'titlesearch' parameter, then the user entered a page title
// or just the first few characters of the title. They also may have entered the first few characters
// of a custom namespace (just text before a :) to search for and pressed the associated Submit button.
// Added the pageback parameter to inform the code that the '<- Special:LintErrors' link had be used to allow
// of a custom namespace (just the text before a ':') to search for and pressed the associated Submit button.
// Added the pageback parameter to inform the code that the '<- Special:LintErrors' link had been used to allow
// the UI to redisplay with previous form values, instead of just resubmitting the query.
if ( $par === null && isset( $params[ 'titlesearch' ] ) && !isset( $params[ 'pageback'] ) ) {
unset( $params[ 'title' ] );
@ -260,7 +258,7 @@ class SpecialLintErrors extends SpecialPage {
$out->addBacklinkSubtitle( $this->getPageTitle() );
$title = $request->getText( 'titlecategorysearch' );
// For category based searches, allow an undefined title to display all records
// For category-based searches, allow an undefined title to display all records
if ( $title === '' ) {
$titleCategorySearch = [ 'titlefield' => '', 'namespace' => $namespaces, 'pageid' => null ];
} else {