jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
......................................................................
build: Updating development dependencies
* mediawiki/mediawiki-codesniffer: 0.4.0 → 0.5.0
Change-Id: Iab338268b786e6b89cc0425cd4b4580f9dd108dc
---
M OnlineStatus.body.php
M OnlineStatus.php
M composer.json
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OnlineStatus.body.php b/OnlineStatus.body.php
index 365aefd..b7102c2 100644
--- a/OnlineStatus.body.php
+++ b/OnlineStatus.body.php
@@ -103,8 +103,9 @@
static function ParserFirstCallInit( $parser ) {
global $wgAllowAnyUserOnlineStatusFunction;
- if ( $wgAllowAnyUserOnlineStatusFunction )
+ if ( $wgAllowAnyUserOnlineStatusFunction ) {
$parser->setFunctionHook( 'anyuseronlinestatus', array(
__CLASS__, 'ParserHookCallback' ) );
+ }
return true;
}
@@ -293,8 +294,9 @@
global $wgUser, $wgUseAjax;
# Require ajax
- if ( !$wgUser->isLoggedIn() || !$wgUseAjax ||
$title->isSpecial( 'Preferences' ) )
+ if ( !$wgUser->isLoggedIn() || !$wgUseAjax ||
$title->isSpecial( 'Preferences' ) ) {
return true;
+ }
$arr = array();
diff --git a/OnlineStatus.php b/OnlineStatus.php
index dd83a0b..73889ab 100644
--- a/OnlineStatus.php
+++ b/OnlineStatus.php
@@ -38,7 +38,7 @@
$wgDefaultUserOptions['onlineonlogin'] = 1;
$wgDefaultUserOptions['offlineonlogout'] = 1;
-$dir = dirname( __FILE__ ) . '/';
+$dir = __DIR__ . '/';
// Classes
$wgAutoloadClasses['OnlineStatus'] = $dir . 'OnlineStatus.body.php';
diff --git a/composer.json b/composer.json
index 4365e8a..99741dd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
- "mediawiki/mediawiki-codesniffer": "0.4.0"
+ "mediawiki/mediawiki-codesniffer": "0.5.0"
},
"scripts": {
"test": [
--
To view, visit https://gerrit.wikimedia.org/r/248536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab338268b786e6b89cc0425cd4b4580f9dd108dc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OnlineStatus
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
