Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index b0d372be85a7ca485e90a558bc8950e894478f85..9b90ce61bfaf65e4ff2fa285f2cff18cb7c5913c 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -705,10 +705,12 @@ class User extends Memcached_DataObject
         if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
             switch ($right)
             {
-             case Right::deleteOthersNotice:
-                $result = $this->hasRole('moderator');
+            case Right::DELETEOTHERSNOTICE:
+                $result = $this->hasRole(User_role::MODERATOR);
                 break;
-             default:
+            case Right::CONFIGURESITE:
+                $result = $this->hasRole(User_role::ADMINISTRATOR);
+            default:
                 $result = false;
                 break;
             }