提交: 2534585cb0f413c5b4875a851ebdc49050b6ebc9 - pukiwiki (git)

Commit MetaInfo

• 修订版: 2534585cb0f413c5b4875a851ebdc49050b6ebc9 (tree)
• 时间: 2007-07-28 23:41:56
• 作者: henoheno <henoheno>
• Commiter: henoheno

Log Message

BugTrack2/255: Keep it $cantedit

更改概述

• modified: lib/auth.php
• modified: lib/file.php

差异

--- a/lib/auth.php
+++ b/lib/auth.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: auth.php,v 1.19 2005/06/13 14:02:07 henoheno Exp $
-// Copyright (C) 2003-2005 PukiWiki Developers Team
+// $Id: auth.php,v 1.20 2007/07/28 14:39:09 henoheno Exp $
+// Copyright (C) 2003-2005, 2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
 // Authentication related functions
@@ -135,9 +135,10 @@ function check_editable($page, $auth_flag = TRUE, $exit_flag = TRUE)
 			// With exit
 			$body = $title = str_replace('$1',
 				htmlspecialchars(strip_bracket($page)), $_title_cannotedit);
-			if (is_freeze($page))
+			if (! is_cantedit($page) && is_freeze($page)) {
 				$body .= '(<a href="' . $script . '?cmd=unfreeze&amp;page=' .
 					rawurlencode($page) . '">' . $_msg_unfreeze . '</a>)';
+			}
 			$page = str_replace('$1', make_search($page), $_title_cannotedit);
 			catbody($title, $page, $body);
 			exit;

--- a/lib/file.php
+++ b/lib/file.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: file.php,v 1.80 2007/05/12 14:24:42 henoheno Exp $
+// $Id: file.php,v 1.81 2007/07/28 14:41:56 henoheno Exp $
 // Copyright (C)
 //   2002-2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -311,7 +311,6 @@ function add_recent($page, $recentpage, $subject = '', $limit = 0)
 	set_file_buffer($fp, 0);
 	flock($fp, LOCK_EX);
 	rewind($fp);
-	fputs($fp, '#freeze'    . "\n");
 	fputs($fp, '#norelated' . "\n"); // :)
 	fputs($fp, join('', $lines));
 	flock($fp, LOCK_UN);