Repository: openmeetings Updated Branches: refs/heads/3.3.x 84bacdab1 -> 4aee66760
no jira: group logo for non admin is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4aee6676 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4aee6676 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4aee6676 Branch: refs/heads/3.3.x Commit: 4aee66760da3d6c4f077b38419d8eba9c977edae Parents: 84bacda Author: Maxim Solodovnik <[email protected]> Authored: Thu Jun 22 14:19:07 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jun 22 14:19:51 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/web/util/GroupLogoResourceReference.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4aee6676/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java index 7da7b7e..051db0d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java @@ -72,7 +72,7 @@ public class GroupLogoResourceReference extends FileSystemResourceReference { } catch (Exception e) { //no-op expected } - if (hasAdminLevel(getRights()) || null != getBean(GroupUserDao.class).getByGroupAndUser(id, getUserId())) { + if (id == null || hasAdminLevel(getRights()) || null != getBean(GroupUserDao.class).getByGroupAndUser(id, getUserId())) { allowed = true; } }
