Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / ExtendedProfile / lib / extendedprofile.php

diff --git a/plugins/ExtendedProfile/lib/extendedprofile.php b/plugins/ExtendedProfile/lib/extendedprofile.php
index d73170b235a6355b0918e3bbdfd185fdb1f95fcd..3682e6fc9dc35ec1c4c6cdfe9687f1f41cda3b9b 100644 (file)
--- a/plugins/ExtendedProfile/lib/extendedprofile.php
+++ b/plugins/ExtendedProfile/lib/extendedprofile.php
@@ -52,7 +52,7 @@ class ExtendedProfile
     function loadFields()
     {
         $detail = new Profile_detail();
-        $detail->profile_id = $this->profile->id;
+        $detail->profile_id = $this->profile->getID();
         $detail->find();
 
         $fields = array();
@@ -71,7 +71,7 @@ class ExtendedProfile
      */
     function getTags()
     {
-        return implode(' ', $this->user->getSelfTags());
+        return implode(' ', Profile_tag::getSelfTagsArray($this->profile));
     }
 
     /**