|
@@ -96,7 +96,7 @@ |
|
|
block discarded – undo |
|
96
|
96
|
|
|
97
|
97
|
$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")); |
|
98
|
98
|
$modules_rights = $this->module->getModuleRights(); |
|
99
|
|
- $ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights); |
|
|
99
|
+ $ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights); |
|
100
|
100
|
|
|
101
|
101
|
if ($admin_page == "ribsadmin" && !$api && strpos($route, "login") === false && strpos($route, "register") === false) { |
|
102
|
102
|
//redirection if user not connected |
Please login to merge, or discard this patch.
Piou-piou /
RibsAdminBundle
