[MediaWiki-commits] [Gerrit] Hygiene: Adjust chrome header generation for templating - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/216144

Change subject: Hygiene: Adjust chrome header generation for templating
......................................................................

Hygiene: Adjust chrome header generation for templating

renderChromeHeaderContent => getChromeHeaderContentHtml

Change-Id: I18dde4e52015b4ced2e1e9a6cf9f27d93b6995a9
---
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateAlpha.php
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/44/216144/1

diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index ebb1153..299c6cb 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -26,8 +26,8 @@
         * Renders the header content for the top chrome.
         * @param array $data Data used to build the page
         */
-       protected function makeChromeHeaderContent( $data ) {
-               echo $this->makeSearchForm( $data );
+       protected function getChromeHeaderContentHtml( $data ) {
+               return $this->makeSearchForm( $data );
        }
 
        /**
@@ -379,7 +379,7 @@
         */
        protected function renderHeader( $data ) {
                $this->html( 'menuButton' );
-               $this->makeChromeHeaderContent( $data );
+               echo $this->getChromeHeaderContentHtml( $data );
                echo $data['secondaryButton'];
        }
 
diff --git a/includes/skins/MinervaTemplateAlpha.php 
b/includes/skins/MinervaTemplateAlpha.php
index 3a6d3d7..40cbce5 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -54,7 +54,7 @@
         * @inheritdoc
         * Renders a search link and branding.
         */
-       protected function makeChromeHeaderContent( $data ) {
+       protected function getChromeHeaderContentHtml( $data ) {
                $templateParser = new TemplateParser( __DIR__ );
                $args = array(
                        'siteName' => SkinMinerva::getSitename(),
@@ -63,7 +63,7 @@
                        'mobileMenuTitle' => wfMessage( 
'mobile-frontend-main-menu' )->parse()
                );
 
-               echo $templateParser->processTemplate( 'header', $args );
+               return $templateParser->processTemplate( 'header', $args );
        }
 
        protected function getSearchAttributes() {
@@ -101,7 +101,7 @@
         * @param array $data Data used to build the header
         */
        protected function renderHeader( $data ) {
-               $this->makeChromeHeaderContent( $data );
+               echo $this->getChromeHeaderContentHtml( $data );
                echo $data['secondaryButton'];
        }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18dde4e52015b4ced2e1e9a6cf9f27d93b6995a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>

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