r67977 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67976‎ | r67977 | r67978 >
Date:02:31, 14 June 2010
Author:aaron
Status:deferred
Tags:
Comment:
Follow-up r67967: fi_img_timestamp query syntax fix
Modified paths:
  • /trunk/extensions/FlaggedRevs/FlaggedRevs.class.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
@@ -1536,11 +1536,10 @@
15371537 $fileIncludeData = array(
15381538 'fi_rev_id' => $rev->getId(),
15391539 '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
15411543 );
1542 - if ( $time ) { // b/c for bad <char(14) NOT NULL default ''> def
1543 - $fileIncludeData['fi_img_timestamp'] = $dbw->timestamp( $time );
1544 - }
15451544 $imgset[] = $fileIncludeData;
15461545 }
15471546 }
Index: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
@@ -388,13 +388,12 @@
389389 $lastImgTime = $timestamp;
390390
391391 $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
395397 );
396 - if ( $time ) { // b/c for bad <char(14) NOT NULL default ''> def
397 - $fileIncludeData['fi_img_timestamp'] = $dbw->timestamp( $timestamp );
398 - }
399398 $imgset[] = $fileIncludeData;
400399
401400 if ( !isset( $imgParams[$img_title->getDBkey()] ) ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r67978MFT r67977aaron02:34, 14 June 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r67967Removed 'patrol' and 'autopatrol' rights from editor/reviewers. No reason the...aaron00:09, 14 June 2010

Status & tagging log