From aaff38633cd3a81e140e4f4f9132e78c65a561e5 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 27 Oct 2008 09:05:28 +0000
Subject: [PATCH] =?UTF-8?q?#17307533=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?=
 =?UTF-8?q?=EC=9E=90=EB=A5=B4=EA=B8=B0=20=ED=95=A8=EC=88=98=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=9E=98=EB=AA=BB=20=EC=82=AC=EC=9A=A9=EB=90=9C=20?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?=
 =?UTF-8?q?=EA=B8=80=EC=9E=90=20=EA=B8=B8=EC=9D=B4=20=EB=8B=A4=EC=8B=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4699 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 config/func.inc.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/func.inc.php b/config/func.inc.php
index b28884774..b63f7c984 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -211,24 +211,22 @@
     function cut_str($string,$cut_size=0,$tail = '...') { 
         if($cut_size<1 || !$string) return $string;
 
-        $char_width = Array(5,10,11,16,14,16,16,10,11,11,12,13,10,13,10,12,13,13,13,13,13,13,13,13,13,13,10,10,14,13,14,13,16,15,15,16,15,15,14,16,15,8,13,15,14,16,16,16,15,16,15,15,14,16,15,16,16,15,15,13,16,13,13,11,10,14,14,14,14,14,10,14,14,8,9,13,8,16,14,15,14,14,10,14,10,14,13,16,14,13,14,14,14,14,16); 
-        $unicode_width = 21;
-
-        $max_width = $cut_size*$unicode_width/2;
+        $chars = Array(12, 4, 3, 5, 7, 7, 11, 8, 4, 5, 5, 6, 6, 4, 6, 4, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 4, 8, 6, 8, 6, 10, 8, 8, 9, 8, 8, 7, 9, 8, 3, 6, 7, 7, 11, 8, 9, 8, 9, 8, 8, 7, 8, 8, 10, 8, 8, 8, 6, 11, 6, 6, 6, 4, 7, 7, 7, 7, 7, 3, 7, 7, 3, 3, 6, 3, 9, 7, 7, 7, 7, 4, 7, 3, 7, 6, 10, 6, 6, 7, 6, 6, 6, 9);
+        $max_width = $cut_size*$chars[0]/2;
         $char_width = 0;
 
         $string_length = strlen($string);
         $char_count = 0;
 
         $idx = 0;
-        while($idx < $string_length && $char_count < $cut_size && $char_width < $max_width) {
+        while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width) {
             $c = ord(substr($string, $idx,1));
             $char_count++;
             if($c<128) {
-                $char_width += (int)$char_width[$c-32];
+                $char_width += (int)$chars[$c-32];
                 $idx++;
             } else {
-                $char_width += $unicode_width;
+                $char_width += $chars[0];
                 $idx += 3;
             }
         }