* (bug 3182) Clear link cache during import to prevent memory leak

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 72bc19d..c59eddb 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -118,6 +118,7 @@ fully support the editing toolbar, but was found to be too confusing.
   by default when 'watchdefault' option is on
 * Skip update of disused 'rc_cur_time' field (todo: discard the field)
 * (bug 3506) Avoid MySQL error when Listusers returns no results
+* (bug 3182) Clear link cache during import to prevent memory leak
 
 
 === Caveats ===

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 5a7db20..c36b48b 100644 (file)
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -197,6 +197,10 @@ class WikiRevision {
                        $userText = $this->getUser();
                }
 
+               // avoid memory leak...?
+               global $wgLinkCache;
+               $wgLinkCache->clear();
+               
                $article = new Article( $this->title );
                $pageId = $article->getId();
                if( $pageId == 0 ) {

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 15110ff..3a58550 100644 (file)
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -45,6 +45,7 @@ class BackupReader {
        function handleRevision( $rev ) {
                $title = $rev->getTitle();
                if (!$title) {
+                       $this->progress( "Got bogus revision with null title!" );
                        return;
                }
                $display = $title->getPrefixedText();