|
@@ -79,7 +79,7 @@ |
|
|
block discarded – undo |
|
79
|
79
|
|
|
80
|
80
|
$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")); |
|
81
|
81
|
$modules_rights = $this->module->getModuleRights(); |
|
82
|
|
- $ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights); |
|
|
82
|
+ $ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights); |
|
83
|
83
|
|
|
84
|
84
|
if ($admin_page == "ribsadmin" && $api !== "api" && strpos($route, "login") === false && strpos($route, "register") === false) { |
|
85
|
85
|
//redirection si user pas connecté |
Please login to merge, or discard this patch.
Piou-piou /
RibsAdminBundle
