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

Merge pull request #882 from kraity/master

Browse Source 
修复 XmlRpc 接口的几个错误问题
This commit is contained in:
joyqi
2019-09-03 14:10:53 +08:00
committed by GitHub
parent 147f7ede98 5abd915678
commit c17bdaf606
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/Dockerfile
View File

@@ -18,6 +18,7 @@ RUN sed -i 's/archive.ubuntu.com/'$ubuntu_mirror'/g' /etc/apt/sources.list && \
# install mysql
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server && \
mkdir -p /var/run/mysqld && chown mysql:mysql /var/run/mysqld && \
# sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/mysql.conf.d/mysqld.cnf && \
sed -i 's/^\(log_error\s.*\)/# \1/' /etc/mysql/my.cnf && \
echo "mysqld_safe &" > /tmp/mysql_config && \

14
var/Widget/XmlRpc.php
View File

@@ -395,8 +395,7 @@ class Widget_XmlRpc extends Widget_Abstract_Contents implements Widget_Interface
'dateCreated' => new IXR_Date($this->options->timezone + $pages->created),
'userid' => $pages->authorId,
'page_id' => intval($pages->cid),
/** todo:此处有疑问 */
'page_status' => $this->typechoToWordpressStatus($pages->status, 'page'),
'page_status' => $this->typechoToWordpressStatus(($pages->hasSaved || 'page_draft' == $pages->type) ? 'draft' : $pages->status, 'page'),
'description' => $excerpt,
'title' => $pages->title,
'link' => $pages->permalink,
@@ -485,8 +484,8 @@ class Widget_XmlRpc extends Widget_Abstract_Contents implements Widget_Interface
*/
public function wpEditPage($blogId, $pageId, $userName, $password, $content, $publish)
{
$content['type'] = 'page';
$this->mwEditPost($blogId, $pageId, $userName, $password, $content, $publish);
$content['post_type'] = 'page';
$this->mwEditPost($pageId, $userName, $password, $content, $publish);
}
@@ -1053,8 +1052,7 @@ class Widget_XmlRpc extends Widget_Abstract_Contents implements Widget_Interface
$input = array();
if (!empty($struct['status'])) {
$input['status'] = 'hold' == $input['status'] ? $input['status'] :
$this->wordpressToTypechoStatus($struct['status']);
$input['status'] = $this->wordpressToTypechoStatus($struct['status'], 'comment');
} else {
$input['__typecho_all_comments'] = 'on';
}
@@ -1440,7 +1438,7 @@ class Widget_XmlRpc extends Widget_Abstract_Contents implements Widget_Interface
/** 调整状态 */
if (isset($content["{$type}_status"])) {
$status = $this->wordpressToTypechoStatus($content["{$type}_status"], $type);
$input['visibility'] = isset($content["visibility"]) ? $content["visibility"] : $status;
if ('publish' == $status || 'waiting' == $status || 'private' == $status) {
$input['do'] = 'publish';
@@ -1605,7 +1603,7 @@ class Widget_XmlRpc extends Widget_Abstract_Contents implements Widget_Interface
'wp_author_id' => $posts->authorId,
'wp_author_display_name' => $posts->author->screenName,
'date_created_gmt' => new IXR_Date($posts->created),
'post_status' => $this->typechoToWordpressStatus($posts->status, 'post'),
'post_status' => $this->typechoToWordpressStatus(($posts->hasSaved || 'post_draft' == $posts->type) ? 'draft' : $posts->status, 'post'),
'custom_fields' => array(),
'wp_post_format' => 'standard',
'date_modified' => new IXR_Date($this->options->timezone + $posts->modified),