jenkins-bot has submitted this change and it was merged.

Change subject: Header should render even if no header exists yet
......................................................................


Header should render even if no header exists yet

Catchable fatal error: Argument 1 passed to
Flow\Templating::renderHeader() must be an instance of
Flow\Model\Header, null given

Template properly handles no header (it shows a "This talk
page currently has no header." message) so there is no
reason to not allow null-for-header in there.

Bug: 62159
Change-Id: Idc92fed33de8c7be7230023a10a95758635809ca
---
M includes/Templating.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bsitu: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Templating.php b/includes/Templating.php
index 8ad5bce..0de1801 100644
--- a/includes/Templating.php
+++ b/includes/Templating.php
@@ -205,7 +205,7 @@
                ), $return );
        }
 
-       public function renderHeader( Header $header, HeaderBlock $block, User 
$user, $template = '', $return = true ) {
+       public function renderHeader( Header $header = null, HeaderBlock 
$block, User $user, $template = '', $return = true ) {
                if ( !$template ) {
                        $template = 'flow:header.html.php';
                }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc92fed33de8c7be7230023a10a95758635809ca
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to