Skip to content
Snippets Groups Projects

Master

Merged Laurent requested to merge master into WIP
Viewing commit 5994f0da
Show latest version
1 file
+ 1
1
Preferences
Compare changes
+ 1
1
@@ -1935,7 +1935,7 @@ class Class_Profil extends Storm_Model_Abstract {
return
isset($cfg[$module])
? (isset($cfg[$module][$action.$action2])
? $cfg[$module][$action.$action2]
? array_merge($default_cfg,$cfg[$module][$action.$action2])
: $default_cfg)
: $default_cfg;
}