Merge branch '0.9.x' into 1.0.x

2010-10-12 16:33:36 -07:00
parent aa02f6020e 112b6c4079
commit 5f81f6119b
269 changed files with 7703 additions and 3045 deletions
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -854,6 +854,7 @@ class Profile extends Memcached_DataObject
            case Right::SANDBOXUSER:
            case Right::SILENCEUSER:
            case Right::DELETEUSER:
+            case Right::DELETEGROUP:
                $result = $this->hasRole(Profile_role::MODERATOR);
                break;
            case Right::CONFIGURESITE: