ouyang/typecho
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #46

Browse Source 
这是由于判断类型的bug造成的草稿没有被识别，如果还有问题，直接删除页面然后重建
This commit is contained in:
joyqi
2013-11-01 12:11:31 +08:00
parent f0fb9c405f
commit 1cd85e5010
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
var/Widget/Contents/Post/Admin.php
+2 -2
View File
@@ -61,8 +61,8 @@ class Widget_Contents_Post_Admin extends Widget_Abstract_Contents
{
$savedPost = $this->db->fetchRow($this->db->select('cid', 'modified')
->from('table.contents')
->where('table.contents.parent = ? AND table.contents.type = ?',
$this->cid, 'post_draft')
->where('table.contents.parent = ? AND (table.contents.type = ? OR table.contents.type = ?)',
$this->cid, 'post_draft', 'page_draft')
->limit(1));
if ($savedPost) {
var/Widget/Contents/Post/Edit.php
+8 -4
View File
@@ -63,8 +63,8 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
return $this->row;
} else {
return $this->db->fetchRow($this->widget('Widget_Abstract_Contents')->select()
->where('table.contents.parent = ? AND table.contents.type = ?',
$this->cid, 'post_draft')
->where('table.contents.parent = ? AND (table.contents.type = ? OR table.contents.type = ?)',
$this->cid, 'post_draft', 'page_draft')
->limit(1), array($this->widget('Widget_Abstract_Contents'), 'filter'));
}
}
@@ -178,7 +178,9 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
{
/** 发布内容, 检查是否具有直接发布的权限 */
if ($this->user->pass('editor', true)) {
if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
if (empty($contents['visibility'])) {
$contents['status'] = 'publish';
} else if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
if (empty($contents['password']) || 'password' != $contents['visibility']) {
$contents['password'] = '';
}
@@ -248,7 +250,9 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
{
/** 发布内容, 检查是否具有直接发布的权限 */
if ($this->user->pass('editor', true)) {
if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
if (empty($contents['visibility'])) {
$contents['status'] = 'publish';
} else if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
if (empty($contents['password']) || 'password' != $contents['visibility']) {
$contents['password'] = '';
}