--- a/compost.module	qua fev  3 22:53:38 2016
+++ b/compost.module	seg mai  2 15:52:59 2016
@@ -184,9 +184,9 @@
   $node->uid = $GLOBALS['user']->uid;
   $node->created = $node->changed = REQUEST_TIME;
   $node->status = 1;
-  $node->compost_url[LANGUAGE_NONE][0]['url'] = $url;
-  $node->compost_clean_urls[LANGUAGE_NONE][0]['value'] = 0;
-  $node->compost_key[LANGUAGE_NONE][0]['value'] = $agent_pin_key;
+  $node->compost_url['und'][0]['url'] = $url;
+  $node->compost_clean_urls['und'][0]['value'] = 0;
+  $node->compost_key['und'][0]['value'] = $agent_pin_key;
 
   $svc = new CompostProtocolService($manager_pin_key,
                                     compost_get_cipher_factory());
@@ -203,7 +203,7 @@
     return NULL;
   }
 
-  $node->compost_key[LANGUAGE_NONE][0]['value'] = $res->getResponse('setkey');
+  $node->compost_key['und'][0]['value'] = $res->getResponse('setkey');
   node_save($node);
 
   $svc->setManagerKey($manager_key);
@@ -623,8 +623,8 @@
     return;
   }
 
-  $url = $form_state['values']['compost_url'][LANGUAGE_NONE][0]['url'];
-  $logo = $form_state['values']['compost_logo'][LANGUAGE_NONE][0]['url'];
+  $url = isset($form_state['values']['compost_url']['und'][0]['url'])?$form_state['values']['compost_url']['und'][0]['url']:'';
+  $logo = isset($form_state['values']['compost_logo']['und'][0]['url'])?$form_state['values']['compost_logo']['und'][0]['url']:'';
 
   if ($url) {
     _compost_node_validate_url($node, $form_state['values']['type'], $url);
@@ -656,10 +656,9 @@
                      )));
     return;
   }
+   
+  form_set_value($form['compost_url'], array('und' => array(0 => array('url' => compost_normalize_url($url)))), $form_state);
 
-  form_set_value($form['compost_url'],
-                 compost_normalize_url($url), $form_state);
-
   $form_state['storage']['resp'] = $resp;
 }
 
@@ -735,11 +734,12 @@
  * Implements hook_node_update().
  */
 function compost_node_update($node) {
+
   if (compost_node_type_is_site($node->type)) {
-    $url = $node->compost_url[LANGUAGE_NONE][0]['url'];
-    $use_clean = $node->compost_clean_urls[LANGUAGE_NONE][0]['value'];
-    if (($url != $node->original->compost_url[LANGUAGE_NONE][0]['url'])
-        || ($use_clean != $node->original->compost_clean_urls[LANGUAGE_NONE][0]['value'])) {
+    $url = $node->compost_url['und'][0]['url'];
+    $use_clean = $node->compost_clean_urls['und'][0]['value'];
+    if (($url != $node->original->compost_url['und'][0]['url'])
+        || ($use_clean != $node->original->compost_clean_urls['und'][0]['value'])) {
       compost_update_node($node);
     }
   }
