修訂 | 2534585cb0f413c5b4875a851ebdc49050b6ebc9 (tree) |
---|---|
時間 | 2007-07-28 23:41:56 |
作者 | henoheno <henoheno> |
Commiter | henoheno |
BugTrack2/255: Keep it $cantedit
@@ -1,7 +1,7 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone |
3 | -// $Id: auth.php,v 1.19 2005/06/13 14:02:07 henoheno Exp $ | |
4 | -// Copyright (C) 2003-2005 PukiWiki Developers Team | |
3 | +// $Id: auth.php,v 1.20 2007/07/28 14:39:09 henoheno Exp $ | |
4 | +// Copyright (C) 2003-2005, 2007 PukiWiki Developers Team | |
5 | 5 | // License: GPL v2 or (at your option) any later version |
6 | 6 | // |
7 | 7 | // Authentication related functions |
@@ -135,9 +135,10 @@ function check_editable($page, $auth_flag = TRUE, $exit_flag = TRUE) | ||
135 | 135 | // With exit |
136 | 136 | $body = $title = str_replace('$1', |
137 | 137 | htmlspecialchars(strip_bracket($page)), $_title_cannotedit); |
138 | - if (is_freeze($page)) | |
138 | + if (! is_cantedit($page) && is_freeze($page)) { | |
139 | 139 | $body .= '(<a href="' . $script . '?cmd=unfreeze&page=' . |
140 | 140 | rawurlencode($page) . '">' . $_msg_unfreeze . '</a>)'; |
141 | + } | |
141 | 142 | $page = str_replace('$1', make_search($page), $_title_cannotedit); |
142 | 143 | catbody($title, $page, $body); |
143 | 144 | exit; |
@@ -1,6 +1,6 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone. |
3 | -// $Id: file.php,v 1.80 2007/05/12 14:24:42 henoheno Exp $ | |
3 | +// $Id: file.php,v 1.81 2007/07/28 14:41:56 henoheno Exp $ | |
4 | 4 | // Copyright (C) |
5 | 5 | // 2002-2007 PukiWiki Developers Team |
6 | 6 | // 2001-2002 Originally written by yu-ji |
@@ -311,7 +311,6 @@ function add_recent($page, $recentpage, $subject = '', $limit = 0) | ||
311 | 311 | set_file_buffer($fp, 0); |
312 | 312 | flock($fp, LOCK_EX); |
313 | 313 | rewind($fp); |
314 | - fputs($fp, '#freeze' . "\n"); | |
315 | 314 | fputs($fp, '#norelated' . "\n"); // :) |
316 | 315 | fputs($fp, join('', $lines)); |
317 | 316 | flock($fp, LOCK_UN); |