more bugs

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index acc18c6..6278f23 100644 (file)
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -113,6 +113,11 @@ class DumpHTML {
 
                $title = Title::newMainPage();
                $text = $this->getArticleHTML( $title );
+               
+               # Parse the XHTML to find the images
+               $images = $this->findImages( $text );
+               $this->copyImages( $images );
+               
                $file = fopen( "{$this->dest}/index.html", "w" );
                if ( !$file ) {
                        print "\nCan't open index.html for writing\n";
@@ -290,7 +295,7 @@ class DumpHTML {
                global $wgUploadPath, $wgLogo, $wgMaxCredits, $wgSharedUploadPath;
                global $wgHideInterlanguageLinks, $wgUploadDirectory, $wgThumbnailScriptPath;
                global $wgSharedThumbnailScriptPath, $wgEnableParserCache, $wgHooks, $wgServer;
-               global $wgRightsUrl, $wgRightsText, $wgCopyrightIcon;
+               global $wgRightsUrl, $wgRightsText, $wgCopyrightIcon, $wgEnableSidebarCache;
 
                static $oldLogo = NULL;
 
@@ -348,6 +353,7 @@ class DumpHTML {
                $wgThumbnailScriptPath = $wgSharedThumbnailScriptPath = false;
                $wgEnableParserCache = false;
                $wgMathPath = "$wgScriptPath/math";
+               $wgEnableSidebarCache = false;
 
                if ( !empty( $wgRightsText ) ) {
                        $wgRightsUrl = "$wgScriptPath/COPYING.html";

diff --git a/maintenance/dumpHTML.php b/maintenance/dumpHTML.php
index cd70140..608893f 100644 (file)
--- a/maintenance/dumpHTML.php
+++ b/maintenance/dumpHTML.php
@@ -70,7 +70,7 @@ $wgHTMLDump = new DumpHTML( array(
        'alternateScriptPath' => $options['interlang'],
        'interwiki' => $options['interlang'],
        'skin' => $skin,
-       'makeSnapshot' => $options['snapshot'],
+       'makeSnapshot' => $options['image-snapshot'],
 ));