jenkins-bot has submitted this change and it was merged. Change subject: Remove deprecated override of Skin::commonPrintStylesheet() ......................................................................
Remove deprecated override of Skin::commonPrintStylesheet() Removed from core in 1.27. Change-Id: I471eaa628f357488a4c3da569ddfd70119270f92 --- M SpecialThemeDesigner.php 1 file changed, 16 insertions(+), 20 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialThemeDesigner.php b/SpecialThemeDesigner.php index 61c823e..621ef9f 100644 --- a/SpecialThemeDesigner.php +++ b/SpecialThemeDesigner.php @@ -11,32 +11,28 @@ } class ThemeDesignerDummySkin extends Skin { - + function __construct() { parent::__construct(); $this->setMembers(); } - - function commonPrintStylesheet() { - return false; - } - + function setupUserCss( OutputPage $out ) { - + foreach ( $out->getExtStyle() as $url ) { $out->addStyle( $url ); } - + } - + } class SpecialThemeDesigner extends SpecialPage { - + public function __construct() { parent::__construct( 'ThemeDesigner' ); } - + /** * Show the special page * @@ -44,15 +40,15 @@ */ public function execute( $par ) { global $wgOut, $wgExtensionAssetsPath; - + $this->mSkin = new ThemeDesignerDummySkin; - + $this->setHeaders(); - + if ( function_exists("OutputPage::includeJQuery") ) { $wgOut->includeJQuery(); } - + $wgOut->addExtensionStyle("$wgExtensionAssetsPath/ThemeDesigner/frame/style/main.css"); // Yes, the following is ugly... though I still haven't decided if I want to become completely ResourceLoader dependant // While 1.16 is still stable. @@ -63,20 +59,20 @@ $varScript = 'var '.implode(", ", $varScript).';'; $wgOut->addInlineScript($varScript); $wgOut->addScriptFile("$wgExtensionAssetsPath/ThemeDesigner/frame/designer.js"); - + echo $wgOut->headElement( $this->mSkin ); $wgOut->sendCacheControl(); $wgOut->disable(); - + // We've collected our html building into a separate file for readability require(dirname(__FILE__).'/frame/layout.php'); - + echo $this->mSkin->bottomScripts( $wgOut ); echo Html::closeElement('body'); echo Html::closeElement('html'); - + } - + protected function getGroupName() { return 'wiki'; } -- To view, visit https://gerrit.wikimedia.org/r/276054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I471eaa628f357488a4c3da569ddfd70119270f92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ThemeDesigner Gerrit-Branch: master Gerrit-Owner: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: Daniel Friesen <dan...@nadir-seen-fire.com> Gerrit-Reviewer: Krinkle <krinklem...@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