fixed programmatic profile creation via entity_property_values_create…

…_entity() / Rules. Requires the latest Entity API.
fago · Feb 15, 2011 · 2e314fb · 2e314fb
1 parent 501285d
commit 2e314fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/profile2.info.inc b/profile2.info.inc
@@ -24,7 +24,7 @@ class Profile2MetadataController extends EntityDefaultMetadataController {
     $properties['type'] = array(
       'type' => 'profile2_type',
       'getter callback' => 'entity_property_getter_method',
-      'setter callback' => 'entity_property_setter_method',
+      'setter callback' => 'entity_property_verbatim_set',
       'setter permission' => 'administer profiles',
       'required' => TRUE,
       'description' => t('The profile type.'),

diff --git a/profile2.module b/profile2.module
@@ -562,6 +562,9 @@ class Profile extends Entity {
       $this->setUser($values['user']);
       unset($values['user']);
     }
+    if (isset($values['type']) && is_object($values['type'])) {
+      $values['type'] = $values['type']->type;
+    }
     parent::__construct($values, 'profile2');
   }
 
@@ -574,9 +577,12 @@ class Profile extends Entity {
 
   /**
    * Sets a new user owning this profile.
+   *
+   * @param $account
+   *   The user account object or the user account id (uid).
    */
   public function setUser($account) {
-    $this->uid = $account->uid;
+    $this->uid = is_object($account) ? $account->uid : $account;
   }
 
   /**