jenkins-bot has submitted this change and it was merged.
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, 7 insertions(+), 7 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index d8fc8b6..5088959 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -25,9 +25,10 @@
/**
* Renders the header content for the top chrome.
* @param array $data Data used to build the page
+ * @return string
*/
- protected function makeChromeHeaderContent( $data ) {
- echo $this->makeSearchForm( $data );
+ protected function getChromeHeaderContentHtml( $data ) {
+ return $this->makeSearchForm( $data );
}
/**
@@ -369,7 +370,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..d431450 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -52,9 +52,8 @@
/**
* @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 +62,7 @@
'mobileMenuTitle' => wfMessage(
'mobile-frontend-main-menu' )->parse()
);
- echo $templateParser->processTemplate( 'header', $args );
+ return $templateParser->processTemplate( 'header', $args );
}
protected function getSearchAttributes() {
@@ -101,7 +100,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: merged
Gerrit-Change-Id: I18dde4e52015b4ced2e1e9a6cf9f27d93b6995a9
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
