From 5926684aab72265d243142010d9dfa8d642efdb9 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 25 Nov 2012 17:57:39 +0100 Subject: 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 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/lib/Roundcube/rcube_config.php') diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php index 6d208ba3a..8112d2ece 100644 --- a/program/lib/Roundcube/rcube_config.php +++ b/program/lib/Roundcube/rcube_config.php @@ -71,11 +71,11 @@ class rcube_config 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 @@ class rcube_config } if ($fname) { - $this->load_from_file(RCUBE_CONFIG_DIR . '/' . $fname); + $this->load_from_file(RCUBE_CONFIG_DIR . $fname); } } -- cgit v1.2.3