Follow up r24808.
authorPlatonides <platonides@users.mediawiki.org>
Wed, 11 Aug 2010 18:56:38 +0000 (18:56 +0000)
committerPlatonides <platonides@users.mediawiki.org>
Wed, 11 Aug 2010 18:56:38 +0000 (18:56 +0000)
mime is not in getCacheFields(), so $this->mime was never populated at this point (regardless of $info['mime']) and splitMime() always returned unknown.

includes/filerepo/LocalFile.php

index 86ee34d..ac8b161 100644 (file)
@@ -377,10 +377,12 @@ class LocalFile extends File {
                                $this->$field = $info[$field];
                        }
                }
+
                // Fix up mime fields
                if ( isset( $info['major_mime'] ) ) {
                        $this->mime = "{$info['major_mime']}/{$info['minor_mime']}";
                } elseif ( isset( $info['mime'] ) ) {
+                       $this->mime = $info['mime'];
                        list( $this->major_mime, $this->minor_mime ) = self::splitMime( $this->mime );
                }
        }