From 5926684aab72265d243142010d9dfa8d642efdb9 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 25 Nov 2012 11:57:39 -0500
Subject: [PATCH] Unify path schema in global constants: paths always end with a /. Keep RCMAIL_CONFIG_DIR for backwards compatibility
---
program/lib/Roundcube/rcube_config.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index 6d208ba..8112d2e 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -71,11 +71,11 @@
private function load()
{
// load main config file
- if (!$this->load_from_file(RCUBE_CONFIG_DIR . '/main.inc.php'))
+ if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'main.inc.php'))
$this->errors[] = 'main.inc.php was not found.';
// load database config
- if (!$this->load_from_file(RCUBE_CONFIG_DIR . '/db.inc.php'))
+ if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'db.inc.php'))
$this->errors[] = 'db.inc.php was not found.';
// load host-specific configuration
@@ -156,7 +156,7 @@
}
if ($fname) {
- $this->load_from_file(RCUBE_CONFIG_DIR . '/' . $fname);
+ $this->load_from_file(RCUBE_CONFIG_DIR . $fname);
}
}
--
Gitblit v1.9.1