From 47887318a2ca64760db397ff02bd7b72b6cc98cc Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 23 Aug 2006 06:16:38 +0000
Subject: [PATCH] more bugs

---
 maintenance/dumpHTML.inc | 8 +++++++-
 maintenance/dumpHTML.php | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index acc18c61e2..6278f23b0c 100644
--- 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 cd7014077b..608893f700 100644
--- 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'],
 ));
 
 
-- 
2.20.1