From ee9958def526c4ab292864952e98f4e3280eca10 Mon Sep 17 00:00:00 2001
From: joyqi
Date: Wed, 27 Nov 2013 11:12:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=99=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin/custom-fields.php | 2 +-
admin/write-page.php | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/admin/custom-fields.php b/admin/custom-fields.php
index 15742406..d857b074 100644
--- a/admin/custom-fields.php
+++ b/admin/custom-fields.php
@@ -1,7 +1,7 @@
getFieldItems() : $page->getFieldItems();
-$defaultFields = isset($post) ? $post->getDefaultFieldItems() : $post->getDefaultFieldItems();
+$defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaultFieldItems();
?>
diff --git a/admin/write-page.php b/admin/write-page.php
index f260728e..92acb854 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -38,7 +38,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
- content($page); ?>
+
@@ -49,6 +49,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
+
+ content($page); ?>
@@ -141,6 +143,7 @@ if (!$plugged) {
}
include 'file-upload-js.php';
+include 'custom-fields-js.php';
Typecho_Plugin::factory('admin/write-page.php')->bottom($page);
include 'footer.php';
?>
From ed4ca7fd0bc6741c7c2392e14be95b3cd2191a18 Mon Sep 17 00:00:00 2001
From: joyqi
Date: Wed, 27 Nov 2013 12:01:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=84=E8=AE=BA?=
=?UTF-8?q?=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
var/Typecho/Common.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index eb766d8e..4c964c80 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -578,9 +578,12 @@ EOF;
if (empty($dom)) {
$dom = new DOMDocument('1.0', self::$charset);
+ $dom->encoding = self::$charset;
$dom->xmlStandalone = false;
}
- @$dom->loadHTML('' . $html);
+ @$dom->loadHTML(''
+ . ''
+ . $html . '');
foreach($dom->getElementsByTagName('*') as $node){
$tagName = strtolower($node->tagName);