Commit: b9c36a7889ae9d858e6150aa0c0a9aeb04719ae2 - pukiwiki (git)

Commit MetaInfo

• Revisión: b9c36a7889ae9d858e6150aa0c0a9aeb04719ae2 (tree)
• Tiempo: 2007-07-28 22:56:44
• Autor: henoheno <henoheno>
• Commiter: henoheno

Log Message

BugTrack2/255: Keep it $cantedit

Cambiar Resumen

• modified: plugin/freeze.inc.php
• modified: plugin/unfreeze.inc.php

Diferencia incremental

--- a/plugin/freeze.inc.php
+++ b/plugin/freeze.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: freeze.inc.php,v 1.9 2004/12/16 13:32:19 henoheno Exp $
+// $Id: freeze.inc.php,v 1.10 2007/07/28 13:56:44 henoheno Exp $
 //
 // Freeze(Lock) plugin
 
@@ -14,7 +14,7 @@ function plugin_freeze_action()
 	global $_msg_invalidpass, $_msg_freezing, $_btn_freeze;
 
 	$page = isset($vars['page']) ? $vars['page'] : '';
-	if (! $function_freeze || ! is_page($page))
+	if (! $function_freeze  || is_cantedit($page) || ! is_page($page))
 		return array('msg' => '', 'body' => '');
 
 	$pass = isset($vars['pass']) ? $vars['pass'] : NULL;

--- a/plugin/unfreeze.inc.php
+++ b/plugin/unfreeze.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: unfreeze.inc.php,v 1.11 2007/01/21 14:27:08 henoheno Exp $
+// $Id: unfreeze.inc.php,v 1.12 2007/07/28 13:56:44 henoheno Exp $
 // Copyright (C) 2003-2004 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -16,7 +16,7 @@ function plugin_unfreeze_action()
 	global $_msg_invalidpass, $_msg_unfreezing, $_btn_unfreeze;
 
 	$page = isset($vars['page']) ? $vars['page'] : '';
-	if (! $function_freeze || ! is_page($page))
+	if (! $function_freeze || is_cantedit($page) || ! is_page($page))
 		return array('msg' => '', 'body' => '');
 
 	$pass = isset($vars['pass']) ? $vars['pass'] : NULL;