From 9441dde8bfb95277df073717ed7817dced40f948 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 28 Mar 2014 05:41:12 +0100 Subject: Update to MediaWiki 1.22.5 --- maintenance/importTextFile.php | 1 + maintenance/language/messageTypes.inc | 2 ++ maintenance/language/messages.inc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'maintenance') diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php index e081c20b..4a07f2c7 100644 --- a/maintenance/importTextFile.php +++ b/maintenance/importTextFile.php @@ -42,6 +42,7 @@ if ( count( $args ) < 1 || isset( $options['help'] ) ) { echo "\nUsing title '" . $title->getPrefixedText() . "'..."; if ( !$title->exists() || !isset( $options['nooverwrite'] ) ) { + RequestContext::getMain()->setTitle( $title ); $text = file_get_contents( $filename ); $user = isset( $options['user'] ) ? $options['user'] : 'Maintenance script'; diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 0b9b7cb8..f9239b1c 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -266,7 +266,9 @@ $wgIgnoredMessages = array( 'createacct-benefit-icon3', 'today-at', 'redirect-text', + 'helppage', 'edithelppage', + 'helplogin-url', 'autocomment-prefix', 'move-redirect-text', ); diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index de163a61..e351549b 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -484,7 +484,7 @@ $wgMessageStructure = array( 'userlogin-resetlink', 'userlogin-resetpassword-link', 'helplogin-url', - 'userlogin-helplink', + 'userlogin-helplink2', 'userlogin-loggedin', 'userlogin-createanother', 'createacct-join', -- cgit v1.2.2