[evolvis-commits] r12611: Apply fix [#5591] plugin scmcvs - viewcv.php encoding

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:49:52 CET 2011


Author: mirabilos
Date: 2011-02-28 01:49:52 +0100 (Mon, 28 Feb 2011)
New Revision: 12611

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/scm/viewvc.php
Log:
Apply fix [#5591] plugin scmcvs - viewcv.php encoding

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/scm/viewvc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/scm/viewvc.php	2011-02-28 00:49:45 UTC (rev 12610)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/scm/viewvc.php	2011-02-28 00:49:52 UTC (rev 12611)
@@ -131,7 +131,7 @@
 	// If we output html and we found the mbstring extension, we
 	// should try to encode the output of ViewCVS in UTF-8
 	if (extension_loaded('mbstring')) {
-		$encoding = mb_detect_encoding($content);
+		$encoding = mb_detect_encoding($content, 'UTF-8, ISO-8859-1');
 		if($encoding != 'UTF-8') {
 			$content = mb_convert_encoding($content, 'UTF-8', $encoding);
 		}



More information about the evolvis-commits mailing list