r68663 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r68662‎ | r68663 | r68664 >
Date:15:53, 28 June 2010
Author:aaron
Status:reverted
Tags:
Comment:
MFT r68662
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/FlaggedRevs (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/FlaggedRevs/FlaggedRevs.class.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/FlaggedRevs/forms/RevisionReviewForm.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/FlaggedRevs/language (modified) (history)

Diff [purge]

Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs/language
___________________________________________________________________
Name: svn:mergeinfo
11 - /branches/REL1_15/phase3/extensions/FlaggedRevs_alpha/language:51646
/trunk/extensions/FlaggedRevs/language:63264-67411,68032-68248,68264
/trunk/extensions/FlaggedRevs_alpha/language:56207,56209,56296,56333,56355
/trunk/phase3/extensions/FlaggedRevs_alpha/language:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
22 + /branches/REL1_15/phase3/extensions/FlaggedRevs_alpha/language:51646
/trunk/extensions/FlaggedRevs/language:63264-67411,68032-68248,68264,68662
/trunk/extensions/FlaggedRevs_alpha/language:56207,56209,56296,56333,56355
/trunk/phase3/extensions/FlaggedRevs_alpha/language:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/FlaggedRevs.class.php
——@@ -1557,8 +1557,8 @@
15581558 'fi_rev_id' => $rev->getId(),
15591559 'fi_name' => $dbkey,
15601560 'fi_img_sha1' => $sha1,
1561 - // b/c: NULL becomes '' for old fi_img_timestamp def (non-strict)
1562 - 'fi_img_timestamp' => $time ? $dbw->timestamp( $time ) : null
 1561+ // b/c: fi_img_timestamp DEFAULT either NULL (new) or '' (old)
 1562+ 'fi_img_timestamp' => $time ? $dbw->timestamp( $time ) : 'DEFAULT'
15631563 );
15641564 $imgset[] = $fileIncludeData;
15651565 }
Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/forms/RevisionReviewForm.php
——@@ -391,8 +391,8 @@
392392 'fi_rev_id' => $rev->getId(),
393393 'fi_name' => $img_title->getDBkey(),
394394 '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+ // b/c: fi_img_timestamp DEFAULT either NULL (new) or '' (old)
 396+ 'fi_img_timestamp' => $timestamp ? $dbw->timestamp( $timestamp ) : 'DEFAULT'
397397 );
398398 $imgset[] = $fileIncludeData;
399399
Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs
___________________________________________________________________
Name: svn:mergeinfo
400400 - /branches/REL1_15/phase3/extensions/FlaggedRevs_alpha:51646
/trunk/extensions/FlaggedRevs:63266-63443,63460-63926,63929,63938,63940-64497,64515-64768,64916-65417,65459-65601,65668-65727,65995,66185-66309,66345,66384-66669,66715-66978,67060-67291,68032-68248,68264
/trunk/extensions/FlaggedRevs_alpha:56207,56209,56296,56333,56355
/trunk/phase3/extensions/FlaggedRevs_alpha:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
401401 + /branches/REL1_15/phase3/extensions/FlaggedRevs_alpha:51646
/trunk/extensions/FlaggedRevs:63266-63443,63460-63926,63929,63938,63940-64497,64515-64768,64916-65417,65459-65601,65668-65727,65995,66185-66309,66345,66384-66669,66715-66978,67060-67291,68032-68248,68264,68662
/trunk/extensions/FlaggedRevs_alpha:56207,56209,56296,56333,56355
/trunk/phase3/extensions/FlaggedRevs_alpha:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r68662Improved b/c handling of old fi_img_timestamp defitionaaron15:43, 28 June 2010

Status & tagging log