fix typecho#673

materone · Nov 19, 2017 · 1a2dd1a · 1a2dd1a
1 parent 1faf5b2
commit 1a2dd1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/admin/write-js.php b/admin/write-js.php
@@ -307,7 +307,7 @@ function previewData(cid) {
         if (changed) {
             locked = true;
 
-            if (confirm('<?php _e('内容已经改变尚未保存, 需要保存后才能预览, 是否保存?'); ?>')) {
+            if (confirm('<?php _e('修改后的内容需要保存后才能预览, 是否保存?'); ?>')) {
                 saveData(function (o) {
                     previewData(o.draftId);
                 });

diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php
@@ -1377,7 +1377,8 @@ public function execute()
 
         /** 初始化皮肤函数 */
         $functionsFile = $this->_themeDir . 'functions.php';
-        if ((!$this->_invokeFromOutside || $this->parameter->type == 404) && file_exists($functionsFile)) {
+        if ((!$this->_invokeFromOutside || $this->parameter->type == 404 || $this->parameter->preview)
+            && file_exists($functionsFile)) {
             require_once $functionsFile;
             if (function_exists('themeInit')) {
                 themeInit($this);