[MediaWiki-commits] [Gerrit] Remove useless $out parameter from SkinTemplate::prepareQuic... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove useless $out parameter from SkinTemplate::prepareQuickTemplate() .. Remove useless $out parameter from SkinTemplate::prepareQuickTemplate() Part II; follow-up I4fac5b14af (ff4da35). It makes sufficient time the first part was merged, no need to pass the parameter anymore. Change-Id: Icb390995912b4860df4ce2571105d3a9dc97a092 --- M includes/skins/SkinTemplate.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index 867d8ec..d08da1b 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -271,7 +271,7 @@ wfProfileIn( __METHOD__ . '-init' ); $this-initPage( $out ); wfProfileOut( __METHOD__ . '-init' ); - $tpl = $this-prepareQuickTemplate( $out ); + $tpl = $this-prepareQuickTemplate(); // execute template wfProfileIn( __METHOD__ . '-execute' ); $res = $tpl-execute(); -- To view, visit https://gerrit.wikimedia.org/r/153636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb390995912b4860df4ce2571105d3a9dc97a092 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex coderev...@emsenhuber.ch Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove useless $out parameter from SkinTemplate::prepareQuic... - change (mediawiki/core)
IAlex has uploaded a new change for review. https://gerrit.wikimedia.org/r/153636 Change subject: Remove useless $out parameter from SkinTemplate::prepareQuickTemplate() .. Remove useless $out parameter from SkinTemplate::prepareQuickTemplate() Part II; follow-up I4fac5b14af (ff4da35). It makes sufficient time the first part was merged, no need to pass the parameter anymore. Change-Id: Icb390995912b4860df4ce2571105d3a9dc97a092 --- M includes/skins/SkinTemplate.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/153636/1 diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index 867d8ec..d08da1b 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -271,7 +271,7 @@ wfProfileIn( __METHOD__ . '-init' ); $this-initPage( $out ); wfProfileOut( __METHOD__ . '-init' ); - $tpl = $this-prepareQuickTemplate( $out ); + $tpl = $this-prepareQuickTemplate(); // execute template wfProfileIn( __METHOD__ . '-execute' ); $res = $tpl-execute(); -- To view, visit https://gerrit.wikimedia.org/r/153636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb390995912b4860df4ce2571105d3a9dc97a092 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex coderev...@emsenhuber.ch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove useless $out parameter from SkinTemplate::prepareQuic... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove useless $out parameter from
SkinTemplate::prepareQuickTemplate()
..
Remove useless $out parameter from SkinTemplate::prepareQuickTemplate()
Fix for I0a9a7f10ea (f5a0c23); use $this-getOutput() instead.
Passing different OutputPage object to Skin methods than the one set in
the context is deprecated, so there is no point having that parameter.
The method's signature is also misleading, since it allows null to be
passed, but if that value would be passed to it, the code would
crash since a such case is not handled in the method.
The $out parameter passed to the method from outputPage() is left since
it is required by the MobileFrontend extension. A similar commit will
be done in the extension, and the parameter's removal will happen once
this condition is lifted.
Change-Id: I4fac5b14afeab25f6f79f889c7ce56874827717d
---
M includes/SkinTemplate.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 7da3de9..3ad2f8e 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -271,10 +271,9 @@
* initialize various variables and generate the template
*
* @since 1.23
-* @param $out OutputPage
* @return QuickTemplate the template to be executed by outputPage
*/
- protected function prepareQuickTemplate( OutputPage $out = null ) {
+ protected function prepareQuickTemplate() {
global $wgContLang, $wgScript, $wgStylePath,
$wgMimeType, $wgJsMimeType, $wgXhtmlNamespaces,
$wgHtml5Version,
$wgDisableCounters, $wgSitename, $wgLogo, $wgMaxCredits,
@@ -285,6 +284,7 @@
$title = $this-getTitle();
$request = $this-getRequest();
+ $out = $this-getOutput();
$tpl = $this-setupTemplateForOutput();
wfProfileIn( __METHOD__ . '-stuff-head' );
--
To view, visit https://gerrit.wikimedia.org/r/101656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fac5b14afeab25f6f79f889c7ce56874827717d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Waldir wal...@email.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove useless $out parameter from SkinTemplate::prepareQuic... - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/101656
Change subject: Remove useless $out parameter from
SkinTemplate::prepareQuickTemplate()
..
Remove useless $out parameter from SkinTemplate::prepareQuickTemplate()
Fix for I0a9a7f10ea (f5a0c23); use $this-getOutput() instead.
Passing different OutputPage object to Skin methods than the one set in
the context is deprecated, so there is no point having that parameter.
The method's signature is also misleading, since it allows null to be
passed, but if that value would be passed to it, the code would
crash since a such case is not handled in the method.
The $out parameter passed to the method from outputPage() is left since
it is required by the MobileFrontend extension. A similar commit will
be done in the extension, and the parameter's removal will happen once
this condition is lifted.
Change-Id: I4fac5b14afeab25f6f79f889c7ce56874827717d
---
M includes/SkinTemplate.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/56/101656/1
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 7da3de9..3ad2f8e 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -271,10 +271,9 @@
* initialize various variables and generate the template
*
* @since 1.23
-* @param $out OutputPage
* @return QuickTemplate the template to be executed by outputPage
*/
- protected function prepareQuickTemplate( OutputPage $out = null ) {
+ protected function prepareQuickTemplate() {
global $wgContLang, $wgScript, $wgStylePath,
$wgMimeType, $wgJsMimeType, $wgXhtmlNamespaces,
$wgHtml5Version,
$wgDisableCounters, $wgSitename, $wgLogo, $wgMaxCredits,
@@ -285,6 +284,7 @@
$title = $this-getTitle();
$request = $this-getRequest();
+ $out = $this-getOutput();
$tpl = $this-setupTemplateForOutput();
wfProfileIn( __METHOD__ . '-stuff-head' );
--
To view, visit https://gerrit.wikimedia.org/r/101656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fac5b14afeab25f6f79f889c7ce56874827717d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
