diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-25 17:57:39 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-25 17:57:39 +0100 |
| commit | 5926684aab72265d243142010d9dfa8d642efdb9 (patch) | |
| tree | e15eb289e3367465fa637338b39311892f71754e /program/lib | |
| parent | 92964a4a6c40539ba100f71c3c5be35930be2867 (diff) | |
Unify path schema in global constants: paths always end with a /. Keep RCMAIL_CONFIG_DIR for backwards compatibility
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/bootstrap.php | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_config.php | 6 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_output_html.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index e2fd2a732..47020c1ab 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -60,7 +60,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { } if (!defined('RCUBE_CONFIG_DIR')) { - define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config'); + define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/'); } if (!defined('RCUBE_PLUGINS_DIR')) { 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); } } diff --git a/program/lib/Roundcube/rcube_output_html.php b/program/lib/Roundcube/rcube_output_html.php index f5c639707..0d51eaf06 100644 --- a/program/lib/Roundcube/rcube_output_html.php +++ b/program/lib/Roundcube/rcube_output_html.php @@ -1760,7 +1760,7 @@ class rcube_output_html extends rcube_output 'about.html', ); foreach ($filenames as $file) { - $fn = RCUBE_CONFIG_DIR . '/' . $file; + $fn = RCUBE_CONFIG_DIR . $file; if (is_readable($fn)) { $content = file_get_contents($fn); $content = $this->parse_conditions($content); |