summaryrefslogtreecommitdiff
path: root/maintenance
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-03-28 05:41:12 +0100
committerPierre Schmitz <pierre@archlinux.de>2014-03-28 05:41:12 +0100
commit9441dde8bfb95277df073717ed7817dced40f948 (patch)
treeba31c10147e91bda378b77c8cae90c5651af9bfe /maintenance
parentd417de70fcf39e0a7a15ba780b597914d16ca0f7 (diff)
Update to MediaWiki 1.22.5
Diffstat (limited to 'maintenance')
-rw-r--r--maintenance/importTextFile.php1
-rw-r--r--maintenance/language/messageTypes.inc2
-rw-r--r--maintenance/language/messages.inc2
3 files changed, 4 insertions, 1 deletions
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',