http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62120
Revision: 62120
Author: tstarling
Date: 2010-02-08 07:03:17 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
MFT r62119.
Modified Paths:
--------------
branches/wmf-deployment/includes/Revision.php
Property Changed:
----------------
branches/wmf-deployment/includes/Revision.php
Modified: branches/wmf-deployment/includes/Revision.php
===================================================================
--- branches/wmf-deployment/includes/Revision.php 2010-02-08 07:01:46 UTC
(rev 62119)
+++ branches/wmf-deployment/includes/Revision.php 2010-02-08 07:03:17 UTC
(rev 62120)
@@ -753,7 +753,9 @@
}
global $wgLegacyEncoding;
- if( $wgLegacyEncoding && !in_array( 'utf-8', $flags )
&& !in_array( 'utf8', $flags ) ) {
+ if( $text !== false && $wgLegacyEncoding
+ && !in_array( 'utf-8', $flags ) && !in_array(
'utf8', $flags ) )
+ {
# Old revisions kept around in a legacy
encoding?
# Upconvert on demand.
# ("utf8" checked for compatibility with some
broken
Property changes on: branches/wmf-deployment/includes/Revision.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/Revision.php:51646
/branches/wmf-deployment/includes/Revision.php:53381
/trunk/phase3/includes/Revision.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59718,60704,61557,62119
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
