]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Some rights one does not have if either sandboxed or silenced
authorMikael Nordfeldth <mmn@hethane.se>
Wed, 2 Mar 2016 11:41:56 +0000 (12:41 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Wed, 2 Mar 2016 11:41:56 +0000 (12:41 +0100)
classes/Profile.php

index 3ac2effe3c1ae7a87365f53321266a7a2f95fe77..3dbd883dd821ec89e8ea086caec31753c41d6e43 100644 (file)
@@ -1325,7 +1325,7 @@ class Profile extends Managed_DataObject
             case Right::EMAILONREPLY:
             case Right::EMAILONSUBSCRIBE:
             case Right::EMAILONFAVE:
-                $result = !$this->isSandboxed();
+                $result = !$this->isSandboxed() && !$this->isSilenced();
                 break;
             case Right::WEBLOGIN:
                 $result = !$this->isSilenced();