[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename BaseTemplate::clear to getClear to avoid conflicts wi...

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

Change subject: Rename BaseTemplate::clear to getClear to avoid conflicts with 
Example skin and derivatives
..


Rename BaseTemplate::clear to getClear to avoid conflicts
with Example skin and derivatives

Also it's a bit more consistent with everything else anyway.

Change-Id: I2745d51267790e93fe2b92a75e88621abbb57fd1
---
M includes/skins/BaseTemplate.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index dc0a703..5868904 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -699,7 +699,7 @@
$html .= Html::closeElement( 'ul' );
}
 
-   $html .= $this->clear() . $footerEnd;
+   $html .= $this->getClear() . $footerEnd;
 
return $html;
}
@@ -710,7 +710,7 @@
 * @return string html
 * @since 1.29
 */
-   protected function clear() {
+   protected function getClear() {
return Html::element( 'div', [ 'class' => 'visualClear' ] );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2745d51267790e93fe2b92a75e88621abbb57fd1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Isarra 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
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/core[master]: Rename BaseTemplate::clear to getClear to avoid conflicts wi...

2017-04-05 Thread Isarra (Code Review) 
Isarra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346614 )

Change subject: Rename BaseTemplate::clear to getClear to avoid conflicts with 
Example skin and derivatives
..

Rename BaseTemplate::clear to getClear to avoid conflicts
with Example skin and derivatives

Also it's a bit more consistent with everything else anyway.

Change-Id: I2745d51267790e93fe2b92a75e88621abbb57fd1
---
M includes/skins/BaseTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/14/346614/1

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index dc0a703..2724cad 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -710,7 +710,7 @@
 * @return string html
 * @since 1.29
 */
-   protected function clear() {
+   protected function getClear() {
return Html::element( 'div', [ 'class' => 'visualClear' ] );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2745d51267790e93fe2b92a75e88621abbb57fd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Isarra 

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