From ee9958def526c4ab292864952e98f4e3280eca10 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Wed, 27 Nov 2013 11:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=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 @@
<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
<?php
$fields = isset($post) ? $post->getFieldItems() : $page->getFieldItems();
-$defaultFields = isset($post) ? $post->getDefaultFieldItems() : $post->getDefaultFieldItems();
+$defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaultFieldItems();
?>
<section id="custom-field" class="typecho-post-option<?php if (empty($defaultFields) && empty($fields)): ?> fold<?php endif; ?>">
<label id="custom-field-expand" class="typecho-label"><i class="i-caret-right"></i> <?php _e('自定义字段'); ?></label>
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);
<textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text); ?></textarea>
</p>
- <?php Typecho_Plugin::factory('admin/write-page.php')->content($page); ?>
+ <?php include 'custom-fields.php'; ?>
<p class="submit clearfix">
<span class="right">
<input type="hidden" name="cid" value="<?php $page->cid(); ?>" />
@@ -49,6 +49,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
<?php endif; ?>
</span>
</p>
+
+ <?php Typecho_Plugin::factory('admin/write-page.php')->content($page); ?>
</div>
<div id="edit-secondary" class="col-mb-12 col-tb-3" role="complementary">
<ul class="typecho-option-tabs clearfix">
@@ -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';
?>