Changeset 5706

Timestamp:

04/10/08 14:20:22 (9 months ago)

Author:

inureyes

Message:

#922

• [5705]를 1.6 트리에 반영
  

Location:

branches/1.6/components

Files:

• Eolin.PHP.Core.php (modified) (1 diff)
• Eolin.PHP.UnifiedEnvironment.php (modified) (2 diffs)

branches/1.6/components/Eolin.PHP.Core.php

@@ -110 +110 @@
             }
         }
+        if (preg_match('/&#([0-9]{1,});/', $corrected))
+            $corrected = mb_decode_numericentity($corrected, array(0x0, 0x10000, 0, 0xfffff), 'UTF-8');
         return $corrected;
     }

branches/1.6/components/Eolin.PHP.UnifiedEnvironment.php

@@ -44 +44 @@
     $_SERVER['REMOTE_ADDR'] = $firstIP[0];
 }
-
+/* Workaround for iconv-absent environment. (contributed by Papacha) */
 if (!function_exists('iconv')) {
     if (function_exists('mb_convert_encoding')) {
@@ -54 +54 @@
     }
 }
+/* Workaround for NCR treatment. (contributed by Laziel) */
+if (!function_exists('mb_decode_numericentity')) { 
+    function mb_decode_numericentity($str, $dumb = null, $dumber = null) {
+        if (!function_exists('_mb_decode_numericentity_callback') ) {
+            function _mb_decode_numericentity_callback($t) {
+                $decode = $t[1];
+                    if ($decode < 128) {
+                        $str = chr($decode);
+                    } else if ($decode < 2048) {
+                        $str = chr(192 + (($decode - ($decode % 64)) / 64));
+                        $str .= chr(128 + ($decode % 64));
+                    } else {
+                        $str = chr(224 + (($decode - ($decode % 4096)) / 4096));
+                        $str .= chr(128 + ((($decode % 4096) - ($decode % 64)) / 64));
+                        $str .= chr(128 + ($decode % 64));
+                    }
+                    return $str;
+            }
+        }
+        return preg_replace_callback('/&#([0-9]{1,});/', '_mb_decode_numericentity_callback', $str);
+    }
+}
 ?>