X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions.inc;h=da98e1f39e56afda8c68a36086a29a6c2780d7bb;hb=ee4b43becd604a9234b23a9b6faab3ca7bdf2631;hp=1e86262c188944812ca5d06c28c1e1642224c707;hpb=892350f6b71917e5bf960d543682711c79885e94;p=gosa.git

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 1e86262c1..da98e1f39 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -144,8 +144,14 @@ spl_autoload_register('__gosa_autoload');
  */
 function class_available($name)
 {
-  global $class_mapping;
-  return(isset($class_mapping[$name]));
+  global $class_mapping, $config;
+    
+  $disabled = array();
+  if($config instanceOf config && $config->configRegistry instanceOf configRegistry){
+    $disabled = $config->configRegistry->getDisabledPlugins();
+  }
+
+  return(isset($class_mapping[$name]) && !isset($disabled[$name]));
 }
 
 
@@ -3501,8 +3507,8 @@ function image($path, $action= "", $title= "", $align= "middle")
     if (isset ($config)){
       $theme= $config->get_cfg_value("core","theme");
     } else {
-      # For debuging - avoid that there's no theme set
-      die("config not set!");
+
+      // Fall back to default theme
       $theme= "default";
     }