Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66081
Change subject: Now we've got PHPCS switched on, killing long lines
......................................................................
Now we've got PHPCS switched on, killing long lines
Lest PHPCS throws wobblies over unrelated changes in PHP files with underlying
issues in their code style.
Change-Id: Ifc4aec328d726e9ca62db34af55ea9592c08d9f3
---
M VisualEditor.hooks.php
M VisualEditorMessagesModule.php
2 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/81/66081/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 982dada..f78ee4e 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -65,7 +65,10 @@
'isPageWatched' => $out->getUser()->isWatched(
$out->getTitle() ),
'pageLanguageCode' =>
$out->getTitle()->getPageLanguage()->getHtmlCode(),
'pageLanguageDir' =>
$out->getTitle()->getPageLanguage()->getDir(),
- 'magnifyClipIconURL' => $wgStylePath .
'/common/images/magnify-clip' . ( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png'
// Same as in Linker.php
+ // Same as in Linker.php
+ 'magnifyClipIconURL' => $wgStylePath .
+
'/common/images/magnify-clip' .
+ (
$wgContLang->isRTL() ? '-rtl' : '' ) . '.png'
);
return true;
diff --git a/VisualEditorMessagesModule.php b/VisualEditorMessagesModule.php
index 6821be6..c82ce00 100644
--- a/VisualEditorMessagesModule.php
+++ b/VisualEditorMessagesModule.php
@@ -74,7 +74,11 @@
// Normalise to 'copyrightwarning' so we have a consistent key
in the front-end.
$msgArgs[ 'copyrightwarning' ] = $copywarnMsg;
- $msgKeys = array_values( array_unique( array_merge( $msgKeys,
array_keys( $msgArgs ), array_keys( $msgVals ) ) ) );
+ $msgKeys = array_values( array_unique( array_merge(
+ $msgKeys,
+ array_keys( $msgArgs ),
+ array_keys( $msgVals )
+ ) ) );
return array(
'keys' => $msgKeys,
@@ -100,8 +104,9 @@
return max(
$this->getMsgBlobMtime( $context->getLanguage() ),
// Also invalidate this module if this file changes
(i.e. when messages were
- // added or removed, or when the javascript invocation
in getScript is changes).
- file_exists( __FILE__ ) ? filemtime( __FILE__ ) : 1 //
use 1 because 0 = now, would invalidate continously
+ // added or removed, or when the JavaScript invocation
in getScript is changes).
+ // Use 1 because 0 = now, would invalidate continously
+ file_exists( __FILE__ ) ? filemtime( __FILE__ ) : 1
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/66081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc4aec328d726e9ca62db34af55ea9592c08d9f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
