Merge branch 'release-4.7-revertmaster' into release-4.7

1 files changed, 4 insertions, 2 deletions

diff --git a/app/role.go b/app/role.go
index 9f271ea7a..5f39dd623 100644
--- a/app/role.go
+++ b/app/role.go
@@ -12,6 +12,8 @@ func (a *App) Role(id string) *model.Role {
 	return a.roles[id]
 }
 
-func (a *App) setDefaultRolesBasedOnConfig() {
-	a.roles = utils.DefaultRolesBasedOnConfig(a.Config(), a.License() != nil)
+// Updates the roles based on the app config and the global license check. You may need to invoke
+// this when license changes are made.
+func (a *App) SetDefaultRolesBasedOnConfig() {
+	a.roles = utils.DefaultRolesBasedOnConfig(a.Config())
 }