Merge branch 'master' into devel-2.4.8

This commit is contained in:
karel.picman@lbcfree.net 2021-05-14 14:25:36 +02:00
commit 7f5b0b85a7

View File

@ -49,7 +49,7 @@ class DmsfController < ApplicationController
def permissions
if !DmsfFolder.permissions?(@folder, false)
render_403
elsif(@folder && (@folder.project != @project))
elsif(@folder && @project && (@folder.project != @project))
render_404
end
true