PostgreSQL: decode image.img_metadata
authorJeff <jeff.janes@gmail.com>
Wed, 23 Apr 2014 06:56:23 +0000 (23:56 -0700)
committerJeff Janes <jeff.janes@gmail.com>
Mon, 5 May 2014 23:02:55 +0000 (16:02 -0700)
The img_metadata field was not being decoded from bytea into text.

This change to core fixes the reported problem with PdfHandler against
1.22.6, origin/REL1_23 and git head.

Bug: 59147
Change-Id: I285a317a57a29713af1f7f630b340278bd5400da

includes/filerepo/file/LocalFile.php

index 4b8e590..b3d5d5d 100644 (file)
@@ -496,6 +496,8 @@ class LocalFile extends File {
 
                $decoded['timestamp'] = wfTimestamp( TS_MW, $decoded['timestamp'] );
 
+               $decoded['metadata'] = $this->repo->getSlaveDB()->decodeBlob( $decoded['metadata'] );
+
                if ( empty( $decoded['major_mime'] ) ) {
                        $decoded['mime'] = 'unknown/unknown';
                } else {