* (bug 2999) Fix encoding conversion of pl_title in upgrade1_5.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 43e4bc3..8b1df21 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -616,6 +616,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2952) Added Asturian language file with translated namespaces
 * (bug 2676) Apply a protective transformation on editing input/output
   for browsers that hit the Unicode blacklist. Patch by plugwash.
+* (bug 2999) Fix encoding conversion of pl_title in upgrade1_5.php
 
 
 === Caveats ===

diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index 34a0929..4c8fcbc 100644 (file)
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -537,9 +537,9 @@ CREATE TABLE $pagelinks (
                        $add = array();
                        while( $row = $this->dbr->fetchObject( $result ) ) {
                                $add[] = array(
-                                       'pl_from'      => $row->l_from,
-                                       'pl_namespace' => $row->cur_namespace,
-                                       'pl_title'     => $row->cur_title );
+                                       'pl_from'      =>              $row->l_from,
+                                       'pl_namespace' =>              $row->cur_namespace,
+                                       'pl_title'     => $this->conv( $row->cur_title ) );
                                $this->addChunk( $add );
                        }
                        $this->lastChunk( $add );