From 5fbc2cad94e5fde886f7ddfba0fba05e2757949a Mon Sep 17 00:00:00 2001
From: gaelg <ggosset@insite.coop>
Date: Wed, 20 Jun 2012 15:23:37 +0200
Subject: [PATCH] Issue #1387258: Fixed errors on file upload.

---
 relation_add.module |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/relation_add.module b/relation_add.module
index 7ff5a46..2ab91de 100644
--- a/relation_add.module
+++ b/relation_add.module
@@ -117,9 +117,9 @@ function relation_add_block_form($form, &$form_state) {
   } // End non-AJAX part
 
   $type = '';
-  if (!empty($form_state['values']['relation_type'])) {
+  if (!empty($form_state['input']['relation_type'])) {
     // Remove ':reverse' suffix if it exists, and set reverse flag
-    $type_array = explode(':', $form_state['values']['relation_type']);
+    $type_array = explode(':', $form_state['input']['relation_type']);
     $type = $type_array[0];
     $form_state['relation_reverse'] = (isset($type_array[1])  && $type_array[1] == 'reverse');
   }
@@ -143,10 +143,12 @@ function relation_add_block_form($form, &$form_state) {
 //    '#title'          => t('Relation options'),
     '#prefix' => '<div id="relation-add-options">',
     '#suffix' => '</div>',
+    '#tree' => TRUE,
+    '#parents' => array('relation_options'),
   );
 
   // AJAXification.
-  if (!empty($form_state['values']['relation_type'])) {
+  if (!empty($form_state['input']['relation_type'])) {
     $relation_type = relation_type_load($type);
     $relation = (object) relation_create($type, array());
 
-- 
1.7.9.5

