Merge "Fix undeletion write-both/read-old mode."

[lhc/web/wiklou.git] / includes / specials / SpecialImport.php

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index ab5d4d7..3ef64f8 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -79,7 +79,7 @@ class SpecialImport extends SpecialPage {
                }
 
                # @todo Allow Title::getUserPermissionsErrors() to take an array
-               # @todo FIXME: Title::checkSpecialsAndNSPermissions() has a very wierd expectation of what
+               # @todo FIXME: Title::checkSpecialsAndNSPermissions() has a very weird expectation of what
                # getUserPermissionsErrors() might actually be used for, hence the 'ns-specialprotected'
                $errors = wfMergeErrorArrays(
                        $this->getPageTitle()->getUserPermissionsErrors(
@@ -526,7 +526,7 @@ class SpecialImport extends SpecialPage {
                                        Xml::checkLabel(
                                                $this->msg( 'import-assign-known-users' )->text(),
                                                'assignKnownUsers',
-                                               'assignKnownUsers',
+                                               'interwikiAssignKnownUsers',
                                                $this->assignKnownUsers
                                        ) .
                                        "</td>