---------- public_html/sites/all/modules/themekey/themekey_base.inc -----------
index 1290a88..ba67fe3 100644
@@ -131,37 +131,44 @@ function _themkey_prepare_object($object) {
 function _themekey_property_field($value, $path) {
   //
   $parts = explode('/', $path);
   foreach ($parts as $part) {
+    
     if (is_array($value) && isset($value[$part])) {
       $value = (array)$value[$part];
     }
     else {
       return NULL;
     }
   }
   
-  return is_array($value) ? array_keys($value) : $value;
+  return $value; //is_array($value) ? array_keys($value) : $value;
 }
 
 /**
  * Function _themekey_match_properties().
  */
 function _themekey_match_properties($parameters, $object = NULL) {
-  //
+  // object == node dans mon cas
+  if(!isset($object) && isset($parameters['node:nid'])){
+     $object = node_load($parameters['node:nid']);
+  }
   if (isset($object)) {
     $parameters = _themkey_prepare_object(array_merge($parameters, (array)drupal_clone($object)));
   }
-  //
+
+
   $properties = variable_get('themekey_properties', array());
   foreach (array_keys($properties) as $property) {
     $value = _themekey_property_value($parameters, $property);
+
     if (!empty($value) || count($value)) {
       $query = 'SELECT * FROM {themekey_properties} WHERE property = \''. $property .'\' AND value ';
       $query .= is_array($value) ? ('IN ('. db_placeholders($value, 'varchar') .') ORDER BY weight') : '= \'%s\'';
       $result = db_query($query, $value);
       while ($item = db_fetch_array($result)) {
         //
+       
         $item['conditions'] = unserialize($item['conditions']);
         if (_themekey_match_conditions($item['conditions'], $parameters)) {
           //
           $callbacks = unserialize($item['callbacks']);
@@ -169,9 +176,9 @@ function _themekey_match_properties($parameters, $object = NULL) {
             foreach ($callbacks as $callback) {
               $callback($item, $parameters);
             }
           }
-          //
+
           return $item['theme'];
         }
       }
     }
@@ -228,8 +235,9 @@ function _themekey_property_value($parameters, $property) {
   if (isset($parameters[$property])) {
     return $parameters[$property];
   }
   
+  
   // Try to get property value utilizing mapped properties
   $nidmap = array('src' => FALSE, 'dst' => FALSE);
   $uidmap = array('src' => FALSE, 'dst' => FALSE);
   $maps = variable_get('themekey_maps', array());