From 462e1b645fcd7c815e3f3b28547b4f443c9ec1d0 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Wed, 26 Feb 2014 14:21:41 +0800
Subject: [PATCH] fix #193

---
 var/Typecho/Common.php             | 2 +-
 var/Widget/Metas/Category/Edit.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index 0e96d640..ed8430d0 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -781,7 +781,7 @@ EOF;
             return mb_strlen($str, self::$charset);
         } else {
             return 'UTF-8' == strtoupper(self::$charset) 
-                ? strlen(utf8_decode($str)) : strlen($info[0]);
+                ? strlen(utf8_decode($str)) : strlen($str);
         }
     }
 
diff --git a/var/Widget/Metas/Category/Edit.php b/var/Widget/Metas/Category/Edit.php
index c166230d..f00ed001 100644
--- a/var/Widget/Metas/Category/Edit.php
+++ b/var/Widget/Metas/Category/Edit.php
@@ -258,8 +258,8 @@ class Widget_Metas_Category_Edit extends Widget_Abstract_Metas implements Widget
         }
 
         /** 取出数据 */
-        $current = $this->fetchRow($this->select()->where('mid = ?', $category['mid']));
         $category = $this->request->from('name', 'slug', 'description', 'parent');
+        $current = $this->fetchRow($this->select()->where('mid = ?', $category['mid']));
         $category['slug'] = Typecho_Common::slugName(empty($category['slug']) ? $category['name'] : $category['slug']);
         $category['type'] = 'category';
         $category['mid'] = $this->request->mid;
@@ -338,8 +338,8 @@ class Widget_Metas_Category_Edit extends Widget_Abstract_Metas implements Widget
         $validator->addRule('merge', 'required', _t('分类主键不存在'));
         $validator->addRule('merge', array($this, 'categoryExists'), _t('请选择需要合并的分类'));
 
-        if ($validator->run($this->request->from('merge'))) {
-            $this->widget('Widget_Notice')->set($e->getMessages(), 'error');
+        if ($error = $validator->run($this->request->from('merge'))) {
+            $this->widget('Widget_Notice')->set($error, 'error');
             $this->response->goBack();
         }