OSDN Git Service
(root)
/
pukiwiki
/
pukiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92b71eb
)
BugTrack/2475 Load template page regardless of $load_template_func
bugtrack_2473_sort_filelist
author
umorigu
<umorigu@gmail.com>
Mon, 4 Jun 2018 16:07:30 +0000
(
01:07
+0900)
committer
umorigu
<umorigu@gmail.com>
Mon, 4 Jun 2018 16:07:30 +0000
(
01:07
+0900)
plugin/edit.inc.php
patch
|
blob
|
history
diff --git
a/plugin/edit.inc.php
b/plugin/edit.inc.php
index
9a38195
..
a4589ae
100644
(file)
--- a/
plugin/edit.inc.php
+++ b/
plugin/edit.inc.php
@@
-1,7
+1,7
@@
<?php
// PukiWiki - Yet another WikiWikiWeb clone.
// edit.inc.php
<?php
// PukiWiki - Yet another WikiWikiWeb clone.
// edit.inc.php
-// Copyright 2001-201
7
PukiWiki Development Team
+// Copyright 2001-201
8
PukiWiki Development Team
// License: GPL v2 or (at your option) any later version
//
// Edit plugin (cmd=edit)
// 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()
{
function plugin_edit_action()
{
- global $vars, $_title_edit
, $load_template_func
;
+ global $vars, $_title_edit;
if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
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']);
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();
return plugin_edit_preview_with_template();
} else if (isset($vars['write'])) {
return plugin_edit_write();