From c8c7edae75cdaf81c85f9d0a0fddcb47320f5713 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 11:41:57 -0400
Subject: [PATCH] Fixed: FS#1623 - vhost.conf.master placed in /root overrides vhost.conf.master in ispconfig/server/conf
---
server/lib/app.inc.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 0a6778e..a1d765d 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -75,7 +75,7 @@
if(is_array($cl)) {
foreach($cl as $classname) {
if(!@is_object($this->$classname)) {
- if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
+ if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && (DEVSYSTEM || !is_link($conf['classpath'].'/'.$classname.'.inc.php'))) {
include_once($conf['classpath'].'/'.$classname.'.inc.php');
$this->$classname = new $classname;
}
@@ -91,7 +91,7 @@
$cl = explode(',',$classes);
if(is_array($cl)) {
foreach($cl as $classname) {
- if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
+ if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && (DEVSYSTEM || !is_link($conf['classpath'].'/'.$classname.'.inc.php'))) {
include_once($conf['classpath'].'/'.$classname.'.inc.php');
} else {
die('Unable to load: '.$conf['classpath'].'/'.$classname.'.inc.php');
@@ -127,10 +127,10 @@
break;
}
- if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
+ if (!fwrite($fp, @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
die('Unable to write to logfile.');
}
- echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
+ echo @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
fclose($fp);
// Log to database
--
Gitblit v1.9.1