Enable merging of WrappedStringList between 'bottomscripts' and 'reportime'
authorTimo Tijhof <krinklemail@gmail.com>
Thu, 24 May 2018 13:10:48 +0000 (14:10 +0100)
committerTimo Tijhof <krinklemail@gmail.com>
Thu, 24 May 2018 13:23:17 +0000 (14:23 +0100)
commit03db2f5b3c9f1de1dcc7098a5ec1f060a933b987
tree7fa50fae6c2877d43a6b16e0e259aaba99906913
parent9957322e4439156ed012469479dc3fc49a6936ca
Enable merging of WrappedStringList between 'bottomscripts' and 'reportime'

* Fix ResourceLoaderClientHtml to return what it was documented to
  return, a WrappedStringList. It accidentally used the wrong join()
  method, causing it to create a plain string too early.

* Update method documentations from ClientHtml::getBodyHtml to
  BaseTemplate::getTrail for 'bottomscripts', and from
  ResourceLoader::makeInlineScript for 'reporttime'.

* Update BaseTemplate::getTrail to join by new line instead of native string
  concatenation.

This by itself would suffice for the most common case, but in order
to also account for the possibility of extensions using hooks for
'SkinAfterBottomScripts' that concatenate, update bottomScripts()
to pass a plain string to the hook and merge it later.

Change-Id: If0d227cb9db67229a27d489c082db790ea8e3840
includes/GlobalFunctions.php
includes/resourceloader/ResourceLoader.php
includes/resourceloader/ResourceLoaderClientHtml.php
includes/skins/BaseTemplate.php
includes/skins/Skin.php