diff options
| author | Brion Vibber <brion@pobox.com> | 2010-09-28 15:58:11 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-09-28 15:58:11 -0700 |
| commit | 3839627a6f70b04c1c8f44319f44abeb21589ba7 (patch) | |
| tree | 013b87890143e032f0b3f9213276556d7d3dbdfb /classes/Profile.php | |
| parent | ee6b4c409d9ddc93529a486065998508cda79ecc (diff) | |
| parent | b9177f5e2e3f9697ef1d2863c827d03154ff828e (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/Profile.php')
| -rw-r--r-- | classes/Profile.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Profile.php b/classes/Profile.php index 8f8679550..3a381fcc8 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -103,7 +103,6 @@ class Profile extends Memcached_DataObject foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { # We don't do a scaled one if original is our scaled size if (!($avatar->width == $size && $avatar->height == $size)) { - $scaled_filename = $imagefile->resize($size); //$scaled = DB_DataObject::factory('avatar'); @@ -790,13 +789,14 @@ class Profile extends Memcached_DataObject * @param $right string Name of the right, usually a constant in class Right * @return boolean whether the user has the right in question */ - function hasRight($right) { $result = false; + if ($this->hasRole(Profile_role::DELETED)) { return false; } + if (Event::handle('UserRightsCheck', array($this, $right, &$result))) { switch ($right) { |