|
@@ -69,7 +69,7 @@ discard block |
|
|
block discarded – undo |
|
69
|
69
|
$this->globals = $globals; |
|
70
|
70
|
$this->module = $module; |
|
71
|
71
|
$this->token_storage = $tokenStorage; |
|
72
|
|
- if ($this->token_storage->getToken()->getUser() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) { |
|
|
72
|
+ if ($this->token_storage->getToken()->getUser() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) { |
|
73
|
73
|
$this->user = $this->token_storage->getToken()->getUser()->getUser(); |
|
74
|
74
|
} |
|
75
|
75
|
} |
|
@@ -88,7 +88,7 @@ discard block |
|
|
block discarded – undo |
|
88
|
88
|
|
|
89
|
89
|
$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")); |
|
90
|
90
|
$modules_rights = $this->module->getModuleRights(); |
|
91
|
|
- $ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights); |
|
|
91
|
+ $ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights); |
|
92
|
92
|
|
|
93
|
93
|
if ($admin_page == "ribsadmin" && $api !== "api" && strpos($route, "login") === false && strpos($route, "register") === false) { |
|
94
|
94
|
//redirection if user not connected |
Please login to merge, or discard this patch.
Piou-piou /
RibsAdminBundle
