Merge branch '0.9.x' into adminpanel

Conflicts:
	classes/User.php

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/right.php b/lib/right.php
index 4fc981af0..5e66eae0e 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -47,5 +47,15 @@ class Right
 {
     const DELETEOTHERSNOTICE = 'deleteothersnotice';
     const CONFIGURESITE      = 'configuresite';
+    const DELETEUSER         = 'deleteuser';
+    const SILENCEUSER        = 'silenceuser';
+    const SANDBOXUSER        = 'sandboxuser';
+    const NEWNOTICE          = 'newnotice';
+    const PUBLICNOTICE       = 'publicnotice';
+    const NEWMESSAGE         = 'newmessage';
+    const SUBSCRIBE          = 'subscribe';
+    const EMAILONREPLY       = 'emailonreply';
+    const EMAILONSUBSCRIBE   = 'emailonsubscribe';
+    const EMAILONFAVE        = 'emailonfave';
 }