BugTrack2/59: ('string' == 0) may blind collision-detection, because 'strings' are...

diff --git a/lib/html.php b/lib/html.php
index 7c46255..56f013b 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.30 2005/03/13 17:29:02 teanan Exp $
+// $Id: html.php,v 1.31 2005/04/21 14:27:27 henoheno Exp $
 //
 // HTML-publishing related functions
 
@@ -141,7 +141,7 @@ function catbody($title, $page, $body)
 }
 
 // Show 'edit' form
-function edit_form($page, $postdata, $digest = 0, $b_template = TRUE)
+function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
 {
        global $script, $vars, $rows, $cols, $hr, $function_freeze;
        global $_btn_addtop, $_btn_preview, $_btn_repreview, $_btn_update, $_btn_cancel,
@@ -149,9 +149,10 @@ function edit_form($page, $postdata, $digest = 0, $b_template = TRUE)
        global $whatsnew, $_btn_template, $_btn_load, $non_list, $load_template_func;
        global $notimeupdate;
 
-       $refer = $template = $addtag = $add_top = '';
+       // Newly generate $digest or not
+       if ($digest === FALSE) $digest = md5(join('', get_source($page)));
 
-       if ($digest == 0) $digest = md5(join('', get_source($page)));
+       $refer = $template = $addtag = $add_top = '';
 
        $checked_top  = isset($vars['add_top'])     ? ' checked="checked"' : '';
        $checked_time = isset($vars['notimestamp']) ? ' checked="checked"' : '';