Initial fix for bug 20757. Committing for test on server.

diff --git a/includes/Revision.php b/includes/Revision.php
index eeae08b..cbf5625 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -750,7 +750,9 @@ class Revision {
                        }
 
                        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