Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98805
Change subject: Break long lines and suppress false posive
......................................................................
Break long lines and suppress false posive
Change-Id: I14c61d8060cd3a3a2a15193f6721e7f87b783538
---
M includes/api/ApiMain.php
M includes/api/ApiQueryRecentChanges.php
M includes/content/TextContentHandler.php
M includes/filerepo/FileRepo.php
4 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/98805/1
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 861fa82..829ba6f 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -744,7 +744,11 @@
$this->dieUsageMsg( array( 'missingparam',
'token' ) );
}
- if ( !$this->getUser()->matchEditToken(
$moduleParams['token'], $salt, $this->getContext()->getRequest() ) ) {
+ if ( !$this->getUser()->matchEditToken(
+ $moduleParams['token'],
+ $salt,
+ $this->getContext()->getRequest() )
+ ) {
$this->dieUsageMsg( 'sessionfailure' );
}
}
diff --git a/includes/api/ApiQueryRecentChanges.php
b/includes/api/ApiQueryRecentChanges.php
index b44565e..653feab 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -198,7 +198,10 @@
}
// Check permissions
- if ( isset( $show['patrolled'] ) || isset(
$show['!patrolled'] ) || isset( $show['unpatrolled'] ) ) {
+ if ( isset( $show['patrolled'] )
+ || isset( $show['!patrolled'] )
+ || isset( $show['unpatrolled'] )
+ ) {
if ( !$user->useRCPatrol() &&
!$user->useNPPatrol() ) {
$this->dieUsage(
'You need the patrol right to
request the patrolled flag',
diff --git a/includes/content/TextContentHandler.php
b/includes/content/TextContentHandler.php
index c4584ae..94b5c57 100644
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -29,11 +29,13 @@
* @ingroup Content
*/
class TextContentHandler extends ContentHandler {
+ // @codingStandardsIgnoreStart bug 57585
public function __construct( $modelId = CONTENT_MODEL_TEXT,
$formats = array( CONTENT_FORMAT_TEXT )
) {
parent::__construct( $modelId, $formats );
}
+ // @codingStandardsIgnoreEnd
/**
* Returns the content's text as-is.
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 8611238..47efa70 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -70,7 +70,8 @@
/** @var string Equivalent to $wgArticlePath, e.g.
http://en.wikipedia.org/wiki/$1 */
protected $articleUrl;
- /** @var bool Whether to fetch commons image description pages and
display them on the local wiki */
+ /** @var bool Whether to fetch commons image description pages and
display
+ * them on the local wiki */
public $fetchDescription;
/** @var bool Equivalent to $wgCapitalLinks (or
$wgCapitalLinkOverrides[NS_FILE],
--
To view, visit https://gerrit.wikimedia.org/r/98805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14c61d8060cd3a3a2a15193f6721e7f87b783538
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
