| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/FlaggedRevs.class.php |
| — | — | @@ -1536,11 +1536,10 @@ |
| 1537 | 1537 | $fileIncludeData = array( |
| 1538 | 1538 | 'fi_rev_id' => $rev->getId(), |
| 1539 | 1539 | 'fi_name' => $dbkey, |
| 1540 | | - 'fi_img_sha1' => $sha1 |
| | 1540 | + 'fi_img_sha1' => $sha1, |
| | 1541 | + // b/c: NULL becomes '' for old fi_img_timestamp def (non-strict) |
| | 1542 | + 'fi_img_timestamp' => $time ? $dbw->timestamp( $time ) : null |
| 1541 | 1543 | ); |
| 1542 | | - if ( $time ) { // b/c for bad <char(14) NOT NULL default ''> def |
| 1543 | | - $fileIncludeData['fi_img_timestamp'] = $dbw->timestamp( $time ); |
| 1544 | | - } |
| 1545 | 1544 | $imgset[] = $fileIncludeData; |
| 1546 | 1545 | } |
| 1547 | 1546 | } |
| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/forms/RevisionReviewForm.php |
| — | — | @@ -388,13 +388,12 @@ |
| 389 | 389 | $lastImgTime = $timestamp; |
| 390 | 390 | |
| 391 | 391 | $fileIncludeData = array( |
| 392 | | - 'fi_rev_id' => $rev->getId(), |
| 393 | | - 'fi_name' => $img_title->getDBkey(), |
| 394 | | - 'fi_img_sha1' => $key |
| | 392 | + 'fi_rev_id' => $rev->getId(), |
| | 393 | + 'fi_name' => $img_title->getDBkey(), |
| | 394 | + 'fi_img_sha1' => $key, |
| | 395 | + // b/c: NULL becomes '' for old fi_img_timestamp def (non-strict) |
| | 396 | + 'fi_img_timestamp' => $timestamp ? $dbw->timestamp( $timestamp ) : null |
| 395 | 397 | ); |
| 396 | | - if ( $time ) { // b/c for bad <char(14) NOT NULL default ''> def |
| 397 | | - $fileIncludeData['fi_img_timestamp'] = $dbw->timestamp( $timestamp ); |
| 398 | | - } |
| 399 | 398 | $imgset[] = $fileIncludeData; |
| 400 | 399 | |
| 401 | 400 | if ( !isset( $imgParams[$img_title->getDBkey()] ) ) { |