From fb3a98c0f06fb14a188e5a020936768fa04cb205 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 22 Oct 2010 06:24:31 -0400
Subject: [PATCH] Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)
---
server/plugins-available/apache2_plugin.inc.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index e117d13..d8941a8 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1246,7 +1246,8 @@
/*
* add all the webdav-dirs to the webdav-section
*/
- $files = scandir($webdavRoot);
+ $files = @scandir($webdavRoot);
+ if(is_array($files)) {
foreach($files as $file) {
if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest') {
/*
@@ -1267,6 +1268,7 @@
$output .= " </Location> \n";
}
}
+ }
}
/*
* is the "replace-comment-end" found...
--
Gitblit v1.9.1