[MediaWiki-commits] [Gerrit] mediawiki...Vector[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/361112 )

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


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
---
M VectorTemplate.php
M composer.json
M phpcs.xml
3 files changed, 26 insertions(+), 21 deletions(-)

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



diff --git a/VectorTemplate.php b/VectorTemplate.php
index 932f636..234e015 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -322,7 +322,8 @@

renderAfterPortlet( $name );
@@ -499,18 +500,16 @@
msg( 'personaltools' ) ?>
>
getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ){
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
$notLoggedIn =

Html::rawElement( 'li',

[ 'id' => 'pt-anonuserpage' ],

$this->getMsg( 'notloggedin' )->escaped()
);
-
}
 
$personalTools = 
$this->getPersonalTools();
@@ -551,17 +550,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(
'fulltext',
  

[MediaWiki-commits] [Gerrit] mediawiki...Vector[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/361112 )

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

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
---
M VectorTemplate.php
M composer.json
M phpcs.xml
3 files changed, 26 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/12/361112/1

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 932f636..234e015 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -322,7 +322,8 @@

renderAfterPortlet( $name );
@@ -499,18 +500,16 @@
msg( 'personaltools' ) ?>
>
getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ){
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
$notLoggedIn =

Html::rawElement( 'li',

[ 'id' => 'pt-anonuserpage' ],

$this->getMsg( 'notloggedin' )->escaped()
);
-
}
 
$personalTools = 
$this->getPersonalTools();
@@ -551,17 +550,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(
'fulltext',