wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Browse source 
Change-Id: I48f0b64f19f9582b40540fa1b42a39d281979624
This commit is contained in:
Kunal Mehta 2017-08-10 23:22:40 -04:00
parent 60a288418f
commit 27fa8c4f7d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -1,7 +1,7 @@
{ {
"require-dev": { "require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.10.1", "mediawiki/mediawiki-codesniffer": "0.11.0",
"jakub-onderka/php-console-highlighter": "0.3.2" "jakub-onderka/php-console-highlighter": "0.3.2"
}, },
"scripts": { "scripts": {

4
includes/DiscussionParser.php
View file

@ -746,7 +746,7 @@ abstract class EchoDiscussionParser {
if ( $matches[0][0][1] > 1 ) { // is there text before the first headline? if ( $matches[0][0][1] > 1 ) { // is there text before the first headline?
$sections[] = [ $sections[] = [
'header' => false, 'header' => false,
'content' => substr( $text, 0, $matches[0][0][1] - 1 ) 'content' => substr( $text, 0, $matches[0][0][1] - 1 )
]; ];
} }
for ( $i = 0; $i < $sectionNum; $i++ ) { for ( $i = 0; $i < $sectionNum; $i++ ) {
@ -757,7 +757,7 @@ abstract class EchoDiscussionParser {
} }
$sections[] = [ $sections[] = [
'header' => self::extractHeader( $matches[0][$i][0] ), 'header' => self::extractHeader( $matches[0][$i][0] ),
'content' => trim( $content ) 'content' => trim( $content )
]; ];
} }

2
includes/api/ApiEchoNotifications.php
View file

@ -277,7 +277,7 @@ class ApiEchoNotifications extends ApiCrossWikiBase {
// @todo: what to do with this when fetching from multiple wikis? // @todo: what to do with this when fetching from multiple wikis?
$timestamp = wfTimestamp( TS_UNIX, $overfetchedItem->getTimestamp() ); $timestamp = wfTimestamp( TS_UNIX, $overfetchedItem->getTimestamp() );
$id = $overfetchedItem->getEvent()->getId(); $id = $overfetchedItem->getEvent()->getId();
$result['continue'] = $timestamp . '|' . $id; $result['continue'] = $timestamp . '|' . $id;
} }
return $result; return $result;