diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-09-28 23:42:18 +0200 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-09-28 23:42:18 +0200 |
| commit | 9587f9f55b55d2819f9ba57f7befd165ab842fa6 (patch) | |
| tree | 1a8986578755dfb51ff6b04bdc7c007917e29fe5 /classes/Profile.php | |
| parent | b03ece26eb1589c5200094f4d87455ca46db780b (diff) | |
* i18n/L10n and translator documentation updates.
* whitespace and indentation updates
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) { |