diff options
author | Remi Collet <fedora@famillecollet.com> | 2015-02-27 10:35:16 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2015-02-27 10:35:16 +0100 |
commit | 4c68e82fecb2ee4211b467462ab4a7adaa7fa963 (patch) | |
tree | 0b019b005d2c543045d2d6eb9b7d0078eefb1b5e /glpi-0.85-bug5218.patch | |
parent | a327437300fdd612a26d17c7abf6779c9a43fd7f (diff) |
glpi: 0.85.2 with 2 upstream fix
Diffstat (limited to 'glpi-0.85-bug5218.patch')
-rw-r--r-- | glpi-0.85-bug5218.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/glpi-0.85-bug5218.patch b/glpi-0.85-bug5218.patch new file mode 100644 index 0000000..0da9fe6 --- /dev/null +++ b/glpi-0.85-bug5218.patch @@ -0,0 +1,15 @@ +Index: trunk/inc/user.class.php +=================================================================== +--- trunk/inc/user.class.php (révision 23364) ++++ trunk/inc/user.class.php (révision 23365) +@@ -602,7 +602,9 @@ + // Add default profile + if (!$rulesplayed) { + $affectation = array(); +- if (isset($this->input['_profiles_id']) && $this->input['_profiles_id']) { ++ if (isset($this->input['_profiles_id']) && $this->input['_profiles_id'] ++ && Profile::currentUserHaveMoreRightThan(array($this->input['_profiles_id'])) ++ ) { + $profile = $this->input['_profiles_id']; + // Choosen in form, so not dynamic + $affectation['is_dynamic'] = 0; |