Merge branch 'main' into preprod

CCSDForge · Nov 25, 2024 · f05139e · f05139e
2 parents dd9698e + 3806ef4
commit f05139e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/library/Episciences/User.php b/library/Episciences/User.php
@@ -1487,12 +1487,13 @@ public function isNotAllowedToDeclareConflict(): bool
                 $this->hasRole(Episciences_Acl::ROLE_ADMIN)
             ) &&
             !(
-                $this->hasRole(Episciences_Acl::ROLE_SECRETARY) &&
-                $this->hasRole(Episciences_Acl::ROLE_CHIEF_EDITOR) &&
-                $this->hasRole(Episciences_Acl::ROLE_GUEST_EDITOR) &&
-                $this->hasRole(Episciences_Acl::ROLE_EDITOR) &&
+                $this->hasRole(Episciences_Acl::ROLE_SECRETARY) ||
+                $this->hasRole(Episciences_Acl::ROLE_CHIEF_EDITOR) ||
+                $this->hasRole(Episciences_Acl::ROLE_GUEST_EDITOR) ||
+                $this->hasRole(Episciences_Acl::ROLE_EDITOR) ||
                 $this->hasRole(Episciences_Acl::ROLE_COPY_EDITOR)
             );
+
     }