From 4c68e82fecb2ee4211b467462ab4a7adaa7fa963 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 27 Feb 2015 10:35:16 +0100
Subject: glpi: 0.85.2 with 2 upstream fix

---
 glpi-0.85-bug5218.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 glpi-0.85-bug5218.patch

(limited to 'glpi-0.85-bug5218.patch')

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;
-- 
cgit