Fixes for Id2ac68ef (a6e8b13)

- drop no longer used $options variable
- use $this->msg() instead of wfMessage()

Change-Id: Ib690f3a8e63f3ede993e9cd34e2831ef18098ed9

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 351c6fa..b020a8e 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3562,7 +3562,6 @@ $templates
                                $args = $spec;
                                $name = array_shift( $args );
                                if ( isset( $args['options'] ) ) {
-                                       $options = $args['options'];
                                        unset( $args['options'] );
                                        wfDeprecated(
                                                'Adding "options" to ' . __METHOD__ . ' is no longer supported',
@@ -3573,7 +3572,7 @@ $templates
                                $args = array();
                                $name = $spec;
                        }
-                       $s = str_replace( '$' . ( $n + 1 ), wfMessage( $name, $args )->plain(), $s );
+                       $s = str_replace( '$' . ( $n + 1 ), $this->msg( $name, $args )->plain(), $s );
                }
                $this->addWikiText( $s );
        }