From: umorigu <umorigu@gmail.com>
Date: Mon, 4 Jun 2018 16:07:30 +0000 (+0900)
Subject: BugTrack/2475 Load template page regardless of $load_template_func
X-Git-Tag: r1_5_4~100
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=63eb46091b3f3fdc19cff0e4cb7dad70ae4fcb0e;p=pukiwiki%2Fpukiwiki.git

BugTrack/2475 Load template page regardless of $load_template_func
---

diff --git a/plugin/edit.inc.php b/plugin/edit.inc.php
index 9a38195..a4589ae 100644
--- a/plugin/edit.inc.php
+++ b/plugin/edit.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
 // edit.inc.php
-// Copyright 2001-2017 PukiWiki Development Team
+// Copyright 2001-2018 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Edit plugin (cmd=edit)
@@ -11,7 +11,7 @@ define('PLUGIN_EDIT_FREEZE_REGEX', '/^(?:#freeze(?!\w)\s*)+/im');
 
 function plugin_edit_action()
 {
-	global $vars, $_title_edit, $load_template_func;
+	global $vars, $_title_edit;
 
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 
@@ -22,7 +22,7 @@ function plugin_edit_action()
 
 	if (isset($vars['preview'])) {
 		return plugin_edit_preview($vars['msg']);
-	} else if ($load_template_func && isset($vars['template'])) {
+	} else if (isset($vars['template'])) {
 		return plugin_edit_preview_with_template();
 	} else if (isset($vars['write'])) {
 		return plugin_edit_write();