From 38e83268dfcb8d656c33b9be8261f5021818c8a7 Mon Sep 17 00:00:00 2001 From: Isarra Date: Wed, 5 Apr 2017 20:33:26 +0000 Subject: [PATCH] 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 --- includes/skins/BaseTemplate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php index dc0a703853..5868904d20 100644 --- a/includes/skins/BaseTemplate.php +++ b/includes/skins/BaseTemplate.php @@ -699,7 +699,7 @@ abstract class BaseTemplate extends QuickTemplate { $html .= Html::closeElement( 'ul' ); } - $html .= $this->clear() . $footerEnd; + $html .= $this->getClear() . $footerEnd; return $html; } @@ -710,7 +710,7 @@ abstract class BaseTemplate extends QuickTemplate { * @return string html * @since 1.29 */ - protected function clear() { + protected function getClear() { return Html::element( 'div', [ 'class' => 'visualClear' ] ); } -- 2.20.1