From f31eb18a7ee90b132cb3ecd5d264966c8118a365 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 23 Apr 2007 19:49:03 +0000
Subject: [PATCH] *dammit

---
 maintenance/rebuildImages.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 4c02dc9c3b..14a9578d31 100644
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -144,7 +144,7 @@ class ImageBuilder extends FiveUpgrade {
 	}
 
 	function oldimageCallback( $row ) {
-		if( $row->oi_width ) {
+		if( $row->oi_width && $row->oi_media_type ) {
 			return null;
 		}
 
@@ -153,7 +153,11 @@ class ImageBuilder extends FiveUpgrade {
 		return array(
 			'oi_width'  => $info['width' ],
 			'oi_height' => $info['height'],
-			'oi_bits'   => $info['bits'  ] );
+			'oi_bits'   => $info['bits'  ],
+			'oi_metadata' => '', // filled in on-demand
+			'oi_media_type' => $info['media'],
+			'oi_major_mime' => $info['major'],
+			'oi_minor_mime' => $info['minor'] );
 	}
 
 	function crawlMissing() {
-- 
2.20.1