Merge "mw.ui: button: Update focus state"

[lhc/web/wiklou.git] / includes / OutputPage.php

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d62d49b..aa282a7 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -196,12 +196,6 @@ class OutputPage extends ContextSource {
 
        // Parser related.
 
-       /**
-        * @var int
-        * @todo Unused?
-        */
-       private $mContainsOldMagic = 0;
-
        /** @var int */
        protected $mContainsNewMagic = 0;
 
@@ -1412,8 +1406,8 @@ class OutputPage extends ContextSource {
         * @since 1.25
         */
        public function addHelpLink( $to, $overrideBaseUrl = false ) {
-               $this->addModules( 'mediawiki.helplink' );
-               $text = wfMessage( 'helppage-top-gethelp' )->escaped();
+               $this->addModuleStyles( 'mediawiki.helplink' );
+               $text = $this->msg( 'helppage-top-gethelp' )->escaped();
 
                if ( $overrideBaseUrl ) {
                        $helpUrl = $to;