feat: compatibiliy with glpi 9.5

btry · btry · commit 20ca8e09021c · 2020-03-10T14:06:28.000+01:00
Signed-off-by: Thierry Bugier &lt;tbugier@teclib.com&gt;
diff --git a/inc/fields/actorfield.class.php b/inc/fields/actorfield.class.php
@@ -118,7 +118,11 @@ public function displayField($canEdit = true) {
                } else {
                   $user = new User();
                   $user->getFromDB($item);
-                  $value[] = $user->getRawName();
+                  if (method_exists($user, 'getFriendlyName')) {
+                     $value[] = $user->getFriendlyName();
+                  } else {
+                     $value[] = $user->getRawName();
+                  }
                }
             }
             echo implode('<br>', $value);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,11 @@ public function displayField($canEdit = true) {`
`118`	`118`	`} else {`
`119`	`119`	`$user = new User();`
`120`	`120`	`$user->getFromDB($item);`
`121`		`- $value[] = $user->getRawName();`
	`121`	`+ if (method_exists($user, 'getFriendlyName')) {`
	`122`	`+ $value[] = $user->getFriendlyName();`
	`123`	`+ } else {`
	`124`	`+ $value[] = $user->getRawName();`
	`125`	`+ }`
`122`	`126`	`}`
`123`	`127`	`}`
`124`	`128`	`echo implode('<br>', $value);`