X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_plugin.inc;h=953f18ddaab3023caf0e722c82c3ce6e4a25aa6e;hb=bc81ccefd133ead30e4d43c2be5896df4fb89486;hp=9f7923ea75c24aed3663c1f95191a983c43dfee5;hpb=26546b9bff5b5ecc0dde79b82789af390ba734c5;p=gosa.git

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 9f7923ea7..953f18dda 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -400,15 +400,12 @@ class plugin
     $message= array();
 
     /* Skip if we've no config object */
-    if (!isset($this->config)){
+    if (!isset($this->config) || !is_object($this->config)){
       return $message;
     }
 
     /* Find hooks entries for this class */
-    $command= $this->config->search(get_class($this), "CHECK",array('menu'));
-    if ($command == "" && isset($this->config->data['TABS'])){
-      $command= $this->config->search(get_class($this), "CHECK",array('tabs'));
-    }
+    $command= $this->config->search(get_class($this), "CHECK", array('menu', 'tabs'));
 
     if ($command != ""){
 
@@ -569,10 +566,7 @@ class plugin
   function postcreate($add_attrs= array())
   {
     /* Find postcreate entries for this class */
-    $command= $this->config->search(get_class($this), "POSTCREATE",array('menu'));
-    if ($command == "" && isset($this->config->data['TABS'])){
-      $command= $this->config->search(get_class($this), "POSTCREATE",array('tabs'));
-    }
+    $command= $this->config->search(get_class($this), "POSTCREATE",array('menu', 'tabs'));
 
     if ($command != ""){
 
@@ -604,10 +598,7 @@ class plugin
   function postmodify($add_attrs= array())
   {
     /* Find postcreate entries for this class */
-    $command= $this->config->search(get_class($this), "POSTMODIFY",array('menu'));
-    if ($command == "" && isset($this->config->data['TABS'])){
-      $command= $this->config->search(get_class($this), "POSTMODIFY",array('tabs'));
-    }
+    $command= $this->config->search(get_class($this), "POSTMODIFY",array('menu','tabs'));
 
     if ($command != ""){
 
@@ -639,11 +630,7 @@ class plugin
   function postremove($add_attrs= array())
   {
     /* Find postremove entries for this class */
-    $command= $this->config->search(get_class($this), "POSTREMOVE",array('menu'));
-    if ($command == "" && isset($this->config->data['TABS'])){
-      $command= $this->config->search(get_class($this), "POSTREMOVE",array('tabs'));
-    }
-
+    $command= $this->config->search(get_class($this), "POSTREMOVE",array('menu','tabs'));
     if ($command != ""){
 
       /* Additional attributes */