Version 4.2.0

admin/convertutf8/system/Text/Module/Internal.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Conversion module
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
  * @package		IPS Tools
  * @since		4 Sept 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPSUtf8\Text\Module;
@@ -29,6 +28,15 @@ class Internal extends \IPSUtf8\Text\Charset
 	{
 		if ( static::needsConverting( $string, $from, $to ) === false )
 		{
+			/* Make sure it decodes properly - some characters such as £ can cause issues between windows-1250, windows-1252, and iso-8859-1 because they store them differently. @see http://php.net/manual/en/function.utf8-decode.php */
+			if ( $to == 'UTF-8' )
+			{
+				if ( mb_substr_count( utf8_decode( $string ), '?' ) != mb_substr_count( $string, '?' ) )
+				{
+					$string = utf8_encode( $string );
+				}
+			}
+			
 			return $string;
 		}