From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 23 Aug 2006 04:51:05 +0000 (+0000)
Subject: bug fix
X-Git-Tag: 1.31.0-rc.0~55924
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=34678dfe7bbe2bb2efd6727b90a4faa17c3c0476;p=lhc%2Fweb%2Fwiklou.git

bug fix
---

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index 35a2ce79ad..acc18c61e2 100644
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -456,7 +456,7 @@ ENDTEXT;
 		$rel = substr( $srcPath, strlen( $srcPathBase ) + 1 ); // +1 for slash
 		$sourceLoc = "$srcDirBase/$rel";
 		$destLoc = "$destDirBase/$rel";
-		#print "Copying $sourceLoc to $staticLoc\n";
+		#print "Copying $sourceLoc to $destLoc\n";
 		if ( !file_exists( $destLoc ) ) {
 			wfMkdirParents( dirname( $destLoc ), 0755 );
 			if ( function_exists( 'symlink' ) && !$this->forceCopy ) {
@@ -504,12 +504,12 @@ ENDTEXT;
 		foreach ( $images as $escapedImage => $dummy ) {
 			$image = urldecode( $escapedImage );
 
-			if ( $this->makeSnapshot && substr( $image, 0, $uploadPathLength ) == $wgUploadPath ) {
-				$this->copyImage( $image, $wgUploadPath, $wgUploadDirectory, $this->destUploadDirectory );
-			} elseif ( substr( $image, 0, $sharedPathLength ) == $wgSharedUploadPath ) {
+			if ( substr( $image, 0, $sharedPathLength ) == $wgSharedUploadPath ) {
 				$this->copyImage( $image, $wgSharedUploadPath, $wgSharedUploadDirectory, $this->sharedStaticDirectory );
 			} elseif ( substr( $image, 0, $mathPathLength ) == $wgMathPath ) {
 				$this->relativeCopy( $image, $wgMathPath, $wgMathDirectory, "{$this->dest}/math" );
+			} elseif ( $this->makeSnapshot && substr( $image, 0, $uploadPathLength ) == $wgUploadPath ) {
+				$this->copyImage( $image, $wgUploadPath, $wgUploadDirectory, $this->destUploadDirectory );
 			}
 		}
 	}