From 6e7dd729093870ba34596125228b0f014d380932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 28 Sep 2017 14:06:56 +0200
Subject: [PATCH] Merge branch '5700-non-existing-classes-in-pluglist-info'
into '1.3-dev'
Resolve "Non-existing classes in pluglist::$info"
Closes #5700
See merge request !22
---
include/class_pluglist.inc | 4 +++-
plugins/admin/groups/class_ogroup.inc | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 6722fd430..91f122ddf 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -173,7 +173,9 @@ class pluglist {
}
}
foreach ($foreign_refs as $cname => $refs) {
- $this->info[$cname]['plForeignRefs'] = $refs;
+ if (isset($this->info[$cname])) {
+ $this->info[$cname]['plForeignRefs'] = $refs;
+ }
}
/* Provide field for 'all' */
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 190c24dc2..935596482 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -167,7 +167,7 @@ class ogroup extends simplePlugin
'member' => array(
array('user'),
array('ogroup'),
- array('applicationGeneric'),
+ array('application'),
array('serverGeneric'),
array('workstationGeneric'),
array('terminalGeneric'),
--
GitLab