Move html-printtail template variable to SkinVector

As part as our move away from VectorTemplate construct html-printtail
using Skin methods. This copies the logic in
BaseTemplate::getTrail

Bug: T251212
Change-Id: I6a0c0b65f59fcf1f1550ec20d106f0143f681935
This commit is contained in:
jdlrobson 2020-06-03 14:57:03 -07:00
parent 23393d3685
commit 31fd25b43d
2 changed files with 7 additions and 2 deletions

View File

@ -24,6 +24,7 @@
use MediaWiki\MediaWikiServices;
use Vector\Constants;
use Wikimedia\WrappedString;
/**
* Skin subclass for Vector
@ -140,6 +141,12 @@ class SkinVector extends SkinTemplate {
$title = $out->getTitle();
return [
// HTML strings:
'html-printtail' => WrappedString::join( "\n", [
MWDebug::getDebugHTML( $this->getContext() ),
$this->bottomScripts(),
wfReportTime( $out->getCSP()->getNonce() )
] ) . '</body></html>',
'html-sitenotice' => $this->getSiteNotice(),
'html-userlangattributes' => $this->prepareUserLanguageAttributes(),
'html-subtitle' => $this->prepareSubtitle(),

View File

@ -164,8 +164,6 @@ class VectorTemplate extends BaseTemplate {
'html-printfooter' => $skin->printSource(),
'html-catlinks' => $skin->getCategories(),
// From BaseTemplate::getTrail (handles bottom JavaScript)
'html-printtail' => $this->getTrail() . '</body></html>',
'data-footer' => [
'html-hook-vector-before-footer' => $htmlHookVectorBeforeFooter,
'array-footer-rows' => $this->getTemplateFooterRows(),