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

Merge branch 'master' of https://github.com/typecho/typecho-replica

Browse Source
This commit is contained in:
fen 2013-11-27 13:15:49 +08:00
commit 13926365e5
3 changed files with 9 additions and 3 deletions

2
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>

5
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';
?>

5
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('<?xml encoding="UTF-8">' . $html);
@$dom->loadHTML('<?xml encoding="' . self::$charset . '">'
. '<head><meta http-equiv="Content-Type" content="text/html; charset=' . self::$charset . '"/></head><body>'
. $html . '</body>');
foreach($dom->getElementsByTagName('*') as $node){
$tagName = strtolower($node->tagName);