summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-05-22 12:02:12 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-05-22 12:02:12 (GMT)
commit92f8c8a6bb883d7778af2a9670ca1fc5853991eb (patch)
tree2849d069faa8897e9ea79bc6d11c41d449f93b4d
parent9999ec0df41ddfbd4a27e5a198874a891d6bb036 (diff)
downloadkolab-freebusy-92f8c8a6bb883d7778af2a9670ca1fc5853991eb.tar.gz
Only prepend the base directory if it in fact is an absolute path, with basedir ../config we got ../config/../config/config.ini, which realpath() chokes on
-rw-r--r--lib/Kolab/Config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kolab/Config.php b/lib/Kolab/Config.php
index 2aa49bb..c83e146 100644
--- a/lib/Kolab/Config.php
+++ b/lib/Kolab/Config.php
@@ -112,7 +112,7 @@ class Config
*/
protected function resolve_path($file, $use_env)
{
- if ($file[0] != '/') {
+ if ($file[0] != '/' && $this->basedir[0] == '/') {
$file = realpath($this->basedir . '/' . $file);
}