r91127 MediaWiki - Code Review archive
Repository:
MediaWiki
Revision:
<
r91126
|
r91127
|
r91128
>
Date:
22:24, 29 June 2011
Author:
bawolff
Status:
ok
Tags:
Comment:
(follow-up
r91106
) Explicitly compare against the self::BROKEN_FILE constants.
Before was doing if !$metadata, which used to work when self::BROKEN_FILE was 0, now it's -1
and that works less.
Modified paths:
/trunk/phase3/includes/media/ExifBitmap.php
(modified) (
history
)
Diff
[
purge
]
Index: trunk/phase3/includes/media/ExifBitmap.php
—
—
@@ -101,7 +101,8 @@
102
102
*/
103
103
function formatMetadata( $image ) {
104
104
$metadata = $image->getMetadata();
105
- if ( !$metadata ||
105
+ if ( $metadata === self::OLD_BROKEN_FILE ||
106
+ $metadata === self::BROKEN_FILE ||
106
107
$this->isMetadataValid( $image, $metadata ) === self::METADATA_BAD )
107
108
{
108
109
// So we don't try and display metadata from PagedTiffHandler
Sign-offs
User
Flag
Date
Bryan
inspected
07:36, 30 June 2011
Follow-up revisions
Revision
Commit summary
Author
Date
r91581
Partial revert of
r91106
: followup to
r91127
....
brion
18:47, 6 July 2011
Past revisions this follows-up on
Revision
Commit summary
Author
Date
r91106
Add wfUnserialize() wrapper around unserialize to prevent E_NOTICE and use it...
btongminh
20:24, 29 June 2011
Status & tagging log
21:23, 18 July 2011
Reedy
(
talk
|
contribs
)
changed the
tags
for r91127
[
removed:
1.18]
17:16, 30 June 2011
Bryan
(
talk
|
contribs
)
changed the
status
of r91127
[
removed:
new
added:
ok]
22:24, 29 June 2011
Bawolff
(
talk
|
contribs
)
changed the
tags
for r91127
[
added:
1.18]