Index: content_types/node_comment_form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/node_comment_form.inc,v
retrieving revision 1.4
diff -u -p -r1.4 node_comment_form.inc
--- content_types/node_comment_form.inc	31 Aug 2008 23:27:48 -0000	1.4
+++ content_types/node_comment_form.inc	1 Oct 2008 21:06:41 -0000
@@ -65,10 +65,10 @@ function panels_comment_form($edit) {
   // force the form to come back to here.
   $url = parse_url($_GET['q']);
   $path = $url['path'];
-  $form['#action'] = url($path, NULL, array('fragment' => 'new'));
+  $form['#action'] = url($path, array('fragment' => 'new'));
   $form['#redirect'] = array($path, NULL, 'new');
-  $form['#validate']['comment_form_validate'] = array();
-  $form['#submit']['comment_form_submit'] = array();
+  $form['#validate'][] = 'comment_form_validate';
+  $form['#submit'][] = 'comment_form_submit';
   return $form;
 }
 
Index: contexts/node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/node.inc,v
retrieving revision 1.7
diff -u -p -r1.7 node.inc
--- contexts/node.inc	31 Aug 2008 14:48:29 -0000	1.7
+++ contexts/node.inc	1 Oct 2008 21:06:42 -0000
@@ -157,7 +157,7 @@ function panels_context_node_settings_fo
 
 function panels_context_node_settings_form_submit($form, &$form_state) {
   if ($form_state['values']['set_identifier']) {
-    $node = node_load($form_values['nid']);
+    $node = node_load($form_state['values']['nid']);
     $form_state['values']['context']['identifier'] = $node->title;
   }
 
Index: contexts/node_edit_form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/node_edit_form.inc,v
retrieving revision 1.2
diff -u -p -r1.2 node_edit_form.inc
--- contexts/node_edit_form.inc	16 Jul 2008 00:09:03 -0000	1.2
+++ contexts/node_edit_form.inc	1 Oct 2008 21:06:42 -0000
@@ -108,24 +108,24 @@ function panels_context_node_edit_form_s
 /**
  * Validate a node.
  */
-function panels_context_node_edit_form_settings_form_validate($form, $form_values) {
-  if (empty($form_values['external']) && empty($form_values['nid']) && empty($form_values['node'])) {
+function panels_context_node_edit_form_settings_form_validate($form, &$form_state) {
+  if (empty($form_state['values']['external']) && empty($form_state['values']['nid']) && empty($form_state['values']['node'])) {
     form_error($form['node'], t('You must select a node.'));
     return;
   }
 
-  if (empty($form_values['node'])) {
+  if (empty($form_state['values']['node'])) {
     return;
   }
 
-  $nid = $form_values['node'];
+  $nid = $form_state['values']['node'];
   if (is_numeric($nid)) {
     $node = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n WHERE n.nid = %d"), $nid));
   }
   else {
     $node = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid FROM {node} n WHERE LOWER(n.title) = LOWER('%s')"), $nid));
     if ($node) {
-      form_set_value($form['nid'], $node->nid);
+      form_set_value($form['nid'], $node->nid, $form_state);
     }
   }