BugTrack/2484 AutoTicketLink for JIRA: Support underscore key XX_X

[pukiwiki/pukiwiki.git] / plugin / edit.inc.php

diff --git a/plugin/edit.inc.php b/plugin/edit.inc.php
index 89b41f9..1ebfb79 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
-// Copyright 2001-2017 PukiWiki Development Team
+// Copyright 2001-2019 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Edit plugin (cmd=edit)
@@ -11,17 +11,20 @@ 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');
 
-       $page = isset($vars['page']) ? $vars['page'] : '';
+       // Create initial pages
+       plugin_edit_setup_initial_pages();
 
+       $page = isset($vars['page']) ? $vars['page'] : '';
        check_editable($page, true, true);
+       check_readable($page, true, true);
 
        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();
@@ -169,7 +172,7 @@ function plugin_edit_inline()
        }
 
        // URL
-       $script = get_script_uri();
+       $script = get_base_uri();
        if ($isfreeze) {
                $url   = $script . '?cmd=unfreeze&amp;page=' . rawurlencode($s_page);
        } else {
@@ -266,3 +269,16 @@ function plugin_edit_cancel()
        header('Location: ' . get_page_uri($vars['page'], PKWK_URI_ROOT));
        exit;
 }
+
+/**
+ * Setup initial pages
+ */
+function plugin_edit_setup_initial_pages()
+{
+       // Related: Rename plugin
+       if (exist_plugin('rename') && function_exists('plugin_rename_setup_initial_pages')) {
+               plugin_rename_setup_initial_pages();
+       }
+       // AutoTicketLinkName page
+       init_autoticketlink_def_page();
+}