mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-03-18 08:59:40 +01:00
Code Issues Projects Releases Wiki Activity

fix #193

Browse Source
This commit is contained in:
joyqi 2014-02-26 14:21:41 +08:00
parent 4cd7184b5b
commit 462e1b645f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/Typecho/Common.php
View File

@ -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);
}
}

6
var/Widget/Metas/Category/Edit.php
View File

@ -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();
}