Index: context.core.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/context/Attic/context.core.inc,v
retrieving revision 1.1.2.3.2.20.2.13
diff -u -p -r1.1.2.3.2.20.2.13 context.core.inc
--- context.core.inc	9 Feb 2010 18:04:59 -0000	1.1.2.3.2.20.2.13
+++ context.core.inc	12 Feb 2010 10:34:07 -0000
@@ -213,6 +213,7 @@ function context_form_alter(&$form, $for
   // Prevent this from firing on admin pages... damn form driven apis...
   if ($form['#id'] === 'node-form' && arg(0) != 'admin') {
     context_node_condition($form['#node'], 'form');
+    $form['#validate'][] = 'context_form_alter_node_validate';
   }
   else if ($form_id == 'system_modules') {
     context_invalidate_cache();
@@ -220,6 +221,14 @@ function context_form_alter(&$form, $for
 }
 
 /**
+ * Set context also on validate, otherwise forms that don't validate
+ * drop out of context.
+ */
+function context_form_alter_node_validate($form, &$form_state) {
+  context_node_condition($form['#node'], 'form');
+}
+
+/**
  * Centralized node condition call function for the ever increasing number of
  * ways to get at a node view / node form.
  */