X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser.php;h=d8f813c765911ba9b433c97bcf03520b25ae6d31;hb=6d5b6d98b5f68d784fee736518eaaae7a26a51f6;hp=48b0f49f3da93e9802031e8ef5f39cf6c8a369fe;hpb=adf4d960133c262f2e7358546c99b727806cebde;p=quix0rs-gnu-social.git diff --git a/classes/User.php b/classes/User.php index 48b0f49f3d..d8f813c765 100644 --- a/classes/User.php +++ b/classes/User.php @@ -80,7 +80,7 @@ class User extends Memcached_DataObject */ function getProfile() { - if ($this->_profile == -1) { // invalid but distinct from null + if (is_int($this->_profile) && $this->_profile == -1) { // invalid but distinct from null $this->_profile = Profile::staticGet('id', $this->id); if (empty($this->_profile)) { throw new UserNoProfileException($this); @@ -532,12 +532,12 @@ class User extends Memcached_DataObject function getSelfTags() { - return Profile_tag::getTags($this->id, $this->id); + return Profile_tag::getTagsArray($this->id, $this->id, $this->id); } - function setSelfTags($newtags) + function setSelfTags($newtags, $privacy) { - return Profile_tag::setTags($this->id, $this->id, $newtags); + return Profile_tag::setTags($this->id, $this->id, $newtags, $privacy); } function block($other) @@ -809,7 +809,8 @@ class User extends Memcached_DataObject function repeatedToMe($offset=0, $limit=20, $since_id=null, $max_id=null) { - throw new Exception("Not implemented since inbox change."); + // TRANS: Exception thrown when trying view "repeated to me". + throw new Exception(_('Not implemented since inbox change.')); } function shareLocation()