X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_config.inc;h=8d839877c5eec731614953a4f46417164195eea7;hb=0a8eb52048cd81d884b8e3f63613dc70e444fc27;hp=64039fd3a115e36bd2544cbe461fc360d35180a7;hpb=cb6b90270d90d953186b733e6cf5c4693013783b;p=gosa.git diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 64039fd3a..8d839877c 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -70,6 +70,22 @@ class config { function check_and_reload() { + global $ui; + + /* Check if class_location.inc has changed, this is the case + if we have installed or removed plugins. + */ + if(session::is_set("class_location.inc:timestamp")){ + $tmp = stat("../include/class_location.inc"); + if($tmp['mtime'] != session::get("class_location.inc:timestamp")){ + session::un_set("plist"); + } + } + $tmp = stat("../include/class_location.inc"); + session::set("class_location.inc:timestamp",$tmp['mtime']); + + + if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ $this->config_found= FALSE; @@ -761,7 +777,7 @@ class config { } /* Fix name, if it contains a replace tag */ - $name= @LDAP::fix($name); + $name= preg_replace('/\\\\,/', ',', @LDAP::fix($name)); /* Check if current name is too long, then cut it */ if(mb_strlen($name, 'UTF-8')> $max_size){