Call load_host_config() and add reference to Howto_Config (#1485040)

release-0.6
thomascube 17 years ago
parent ad69589792
commit 2ca388d0d7

@ -273,6 +273,7 @@ $rcmail_config['address_book_type'] = 'sql';
$rcmail_config['dont_override'] = array();
// try to load host-specific configuration
// see http://trac.roundcube.net/wiki/Howto_Config for more details
$rcmail_config['include_host_config'] = false;
// don't let users set pagesize to more than this value if set

@ -55,6 +55,9 @@ class rcube_config
include_once(INSTALL_PATH . 'config/db.inc.php');
$this->prop += (array)$rcmail_config;
// load host-specific configuration
$this->load_host_config();
// fix paths
$this->prop['skin_path'] = $this->prop['skin_path'] ? unslashify($this->prop['skin_path']) : 'skins/default';
$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';

Loading…
Cancel
Save