[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361109 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
---
M .gitignore
M MonoBookTemplate.php
M composer.json
M phpcs.xml
4 files changed, 17 insertions(+), 19 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 6625e52..ac6aae6 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -72,7 +72,7 @@
data['undelete'] ) { 
?>
html( 'undelete' ) ?>
data['newtalk'] ) {
?>
@@ -117,7 +117,6 @@

>
getPersonalTools();
 
if ( array_key_exists( 'uls', 
$personalTools ) ) {
@@ -126,8 +125,8 @@
}
 
if ( 
!$this->getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ) {
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
echo Html::rawElement( 
'li', [
'id' => 
'pt-anonuserpage'
], $this->getMsg( 
'notloggedin' )->escaped() );
@@ -159,7 +158,8 @@

getFooterIcons( 'icononly' );
-   $validFooterLinks = $this->getFooterLinks( 'flat' ); // 
Additional footer links
+   // Additional footer links
+   $validFooterLinks = $this->getFooterLinks( 'flat' );
 
if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
?>
@@ -177,7 +177,7 @@
getSkin()->makeFooterIcon( $icon ); ?>
 




@@ -331,7 +328,6 @@
Hooks::run( 'MonoBookAfterToolbox' );
}
 
-   
/*/
function languageBox() {
if ( $this->data['language_urls'] !== false ) {
?>
@@ -344,7 +340,7 @@
makeListItem( $key, $langLink ); ?>
 


 
@@ -355,7 +351,6 @@
}
}
 
-   
/*/
/**
 * @param string $bar
 * @param array|string $cont
@@ -402,4 +397,4 @@


 
-   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

-- 
To view, visit https://gerrit.wikimedia.org/r/361109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361109 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
---
M .gitignore
M MonoBookTemplate.php
M composer.json
M phpcs.xml
4 files changed, 17 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/09/361109/1

diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 6625e52..ac6aae6 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -72,7 +72,7 @@
data['undelete'] ) { 
?>
html( 'undelete' ) ?>
data['newtalk'] ) {
?>
@@ -117,7 +117,6 @@

>
getPersonalTools();
 
if ( array_key_exists( 'uls', 
$personalTools ) ) {
@@ -126,8 +125,8 @@
}
 
if ( 
!$this->getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ) {
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
echo Html::rawElement( 
'li', [
'id' => 
'pt-anonuserpage'
], $this->getMsg( 
'notloggedin' )->escaped() );
@@ -159,7 +158,8 @@

getFooterIcons( 'icononly' );
-   $validFooterLinks = $this->getFooterLinks( 'flat' ); // 
Additional footer links
+   // Additional footer links
+   $validFooterLinks = $this->getFooterLinks( 'flat' );
 
if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
?>
@@ -177,7 +177,7 @@
getSkin()->makeFooterIcon( $icon ); ?>
 




@@ -331,7 +328,6 @@
Hooks::run( 'MonoBookAfterToolbox' );
}
 
-   
/*/
function languageBox() {
if ( $this->data['language_urls'] !== false ) {
?>
@@ -344,7 +340,7 @@
makeListItem( $key, $langLink ); ?>
 


 
@@ -355,7 +351,6 @@
}
}
 
-   
/*/
/**
 * @param string $bar
 * @param array|string $cont
@@ -402,4 +397,4 @@


 
-   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

-- 
To view, visit https://gerrit.wikimedia.org/r/361109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits