bug fix
authorTim Starling <tstarling@users.mediawiki.org>
Wed, 23 Aug 2006 04:51:05 +0000 (04:51 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Wed, 23 Aug 2006 04:51:05 +0000 (04:51 +0000)
maintenance/dumpHTML.inc

index 35a2ce7..acc18c6 100644 (file)
@@ -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 );
                        }
                }
        }