Publishing options and revision information not kept in multi-page node form

When creating a new node the publishing options and entered revision information is not kept if the node edit form is reloaded. When editing an existing node, entered revision information is not kept. This causes unexpected behavior when the node form is a multi-step one, or e.g. javascript is disabled and the upload module is enabled and used.

Platform:
Drupal 6.3, Gentoo Linux, Apache 2.2.9, PHP 5.2.6-pl2-gentoo

Steps to reproduce:
1. Enable 'upload' module, disable Javascript in your browser.
2. Create a new node (any type will do), or edit an existing one, preferrably as site adminstrator
3. Customize the publishing options and revision information (enter a log etc)
4. Click the attach button (no need to actually upload a file).

Result:
The publishing options are reset to their defaults (if creating a new node), the revision information is reset to the default settings and the entered log is lost.

Expected behaviour:
The checked options should remain checked, the unchecked should remain unchecked. Any log message that is entered should be remembered.

I've created two patches to fix this issue. The first (node_remember_options) modifies node_object_prepare such that options are only changed if they are not already set. The second variant checks that the form was not submitted (in node_form), if it is then it does not prepare the node object again.

Both patches set the #default_value of the revision log to $node->log (if set).

I'm not sure which one would be the right approach, since modules may perhaps rely on the nodeapi 'prepare'/node_prepare hook every time the form is redisplayed. The second patch (node_donot_prepare_twice) will cause the node forms to only call prepare for nodes once over the lifetime of the form (until final submission). To me the second patch seems to be the most logical approach though, especially when taking note that the preview button also does not let the prepare hooks run a second time.