Version 3.4.5

upload/ips_kernel/classConvertCharset.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Character set conversion library
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-12-07 14:02:27 -0500 (Fri, 07 Dec 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -17,7 +17,7 @@
  * @subpackage	Kernel
  * @link		http://www.invisionpower.com
  * @since		Friday 2nd December 2005 10:18
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11687 $
  * @version		1.0 2004-07-27 00:37
  * @link		http://www.unicode.org	Unicode Homepage
  * @link		http://www.mikkom.pl	My Homepage
@@ -234,17 +234,25 @@ class classConvertCharset
 		 */
 		if ($string_char_set != "utf-8") 
 		{ 
+			/* Cache the conversion table to prevent rebuilding on every request */
+			static $charsetTables = array();
+
 			/**
 			 * Now build table with both charsets for encoding change. 
 			 */
-			if ($destination_char_set != "utf-8") 
-			{ 
-				$charsetTable = $this->_makeConversionTable( $string_char_set, $destination_char_set );
-			}
-			else
+			if( !$charsetTables[ $string_char_set ] )
 			{
-				$charsetTable = $this->_makeConversionTable( $string_char_set );
+				if ($destination_char_set != "utf-8") 
+				{ 
+					$charsetTables[ $string_char_set ] = $this->_makeConversionTable( $string_char_set, $destination_char_set );
+				}
+				else
+				{
+					$charsetTables[ $string_char_set ] = $this->_makeConversionTable( $string_char_set );
+				}
 			}
+
+			$charsetTable = $charsetTables[ $string_char_set ];
 			
 			if( !count($charsetTable) )
 			{