https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111828
Revision: 111828
Author: reedy
Date: 2012-02-18 14:31:05 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
MFT r111827 to fix r111800, r111801
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/actions/HistoryAction.php
Property Changed:
----------------
branches/REL1_19/extensions/
branches/wmf/1.18wmf1/extensions/
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/extensions/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/actions/HistoryAction.php
Property changes on: branches/REL1_19/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions:111199,111218,111484,111575,111685
+ /trunk/extensions:111199,111218,111484,111575,111685,111713,111715
Property changes on: branches/wmf/1.18wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/REL1_18/extensions:101758,103190
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/trunk/extensions:95614,99592,99653,100092,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863,104865,104971,105275,105902,105908,107043,107050,107337,107783,107816,107818,108701,108789,109532,109536,109542
/trunk/phase3/extensions:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
+ /branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/REL1_18/extensions:101758,103190
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/trunk/extensions:95614,99592,99653,100092,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863,104865,104971,105275,105902,105908,107043,107050,107337,107783,107816,107818,108701,108789,109532,109536,109542,111713,111715
/trunk/phase3/extensions:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111802-111803
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111802-111803,111827
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111659-111661,111668,111670,111688,111690
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111659-111661,111668,111670,111688,111690,111713,111715
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111827
Modified: branches/wmf/1.19wmf1/includes/actions/HistoryAction.php
===================================================================
--- branches/wmf/1.19wmf1/includes/actions/HistoryAction.php 2012-02-18
14:28:38 UTC (rev 111827)
+++ branches/wmf/1.19wmf1/includes/actions/HistoryAction.php 2012-02-18
14:31:05 UTC (rev 111828)
@@ -577,7 +577,7 @@
$prevSize = $prevRev ? $prevRev->getSize() : 0;
$sDiff = ChangesList::showCharacterDifference( $prevSize,
$rev->getSize() );
$fSize = Linker::formatRevisionSize($rev->getSize());
- $s .= "' . . $fSize $sDiff . . ";
+ $s .= " . . $fSize $sDiff . . ";
$s .= Linker::revComment( $rev, false, true );
Property changes on: branches/wmf/1.19wmf1/includes/actions/HistoryAction.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/actions/HistoryAction.php:100352-107913
/branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/REL1_17/phase3/includes/HistoryPage.php:81448
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/actions/HistoryAction.php:111251,111800
+ /branches/JSTesting/includes/actions/HistoryAction.php:100352-107913
/branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/REL1_17/phase3/includes/HistoryPage.php:81448
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/actions/HistoryAction.php:111251,111800,111827
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
