BugTrack/2265 Enable edit_auth for bugtrack and tracker plugin

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

diff --git a/plugin/unfreeze.inc.php b/plugin/unfreeze.inc.php
index 5e88119..e3154ee 100644 (file)
--- a/plugin/unfreeze.inc.php
+++ b/plugin/unfreeze.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: unfreeze.inc.php,v 1.14 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2003-2004, 2007 PukiWiki Developers Team
+// unfreeze.inc.php
+// Copyright 2003-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Unfreeze(Unlock) plugin
@@ -11,10 +11,11 @@ define('PLUGIN_UNFREEZE_EDIT', TRUE);
 
 function plugin_unfreeze_action()
 {
-       global $script, $vars, $function_freeze;
+       global $vars, $function_freeze;
        global $_title_isunfreezed, $_title_unfreezed, $_title_unfreeze;
        global $_msg_invalidpass, $_msg_unfreezing, $_btn_unfreeze;
 
+       $script = get_base_uri();
        $page = isset($vars['page']) ? $vars['page'] : '';
        if (! $function_freeze || ! is_page($page))
                return array('msg' => '', 'body' => '');
@@ -23,7 +24,7 @@ function plugin_unfreeze_action()
        $msg = $body = '';
        if (! is_freeze($page)) {
                // Unfreezed already
-               $msg  = & $_title_isunfreezed;
+               $msg  = $_title_isunfreezed;
                $body = str_replace('$1', htmlsc(strip_bracket($page)),
                        $_title_isunfreezed);
 
@@ -42,17 +43,17 @@ function plugin_unfreeze_action()
                is_freeze($page, TRUE);
                if (PLUGIN_UNFREEZE_EDIT) {
                        $vars['cmd'] = 'read'; // To show 'Freeze' link
-                       $msg  = & $_title_unfreezed;
+                       $msg  = $_title_unfreezed;
+                       $postdata = remove_author_info($postdata);
                        $body = edit_form($page, $postdata);
                } else {
                        $vars['cmd'] = 'read';
-                       $msg  = & $_title_unfreezed;
+                       $msg  = $_title_unfreezed;
                        $body = '';
                }
-
        } else {
                // Show unfreeze form
-               $msg    = & $_title_unfreeze;
+               $msg    = $_title_unfreeze;
                $s_page = htmlsc($page);
                $body   = ($pass === NULL) ? '' : "<p><strong>$_msg_invalidpass</strong></p>\n";
                $body  .= <<<EOD
@@ -67,7 +68,5 @@ function plugin_unfreeze_action()
 </form>
 EOD;
        }
-
        return array('msg'=>$msg, 'body'=>$body);
 }
-?>