Merge "Rename BaseTemplate::clear to getClear to avoid conflicts with Example skin...

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index dc0a703..5868904 100644 (file)
--- 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' ] );
        }