Index: override_node_options.module
===================================================================
--- override_node_options.module	(revision 154)
+++ override_node_options.module	(working copy)
@@ -17,7 +17,7 @@
 /**
  * Implementation of hook_form_alter().
  */
-function override_node_options_form_alter($form_id, &$form) {
+function override_node_options_form_alter(&$form, &$form_state, $form_id) {
   // Allow users with 'override node publishing options' to change node
   // options. Taken from node_form_array().
   // TODO: Once in core, remove adminster nodes check.
@@ -36,7 +36,7 @@
  */
 function override_node_options_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   switch ($op) {
-    case 'submit':
+    case 'presave':
       // Allow users with 'override node publishing options' to change node
       // options.
       // TODO: Once in core, remove adminster nodes check.
Index: override_node_options.info
===================================================================
--- override_node_options.info	(revision 154)
+++ override_node_options.info	(working copy)
@@ -1,3 +1,4 @@
 ; $Id: override_node_options.info,v 1.2.2.1 2007/06/18 23:06:56 dww Exp $
 name = Override Node Publishing Options
 description = "Allow non-admins to override the default publishing options for nodes they can edit."
+core = 6.x