*/
public static function init($server=null, $path=null, $conffile=null)
{
+ Router::clear();
+
StatusNet::initDefaults($server, $path);
StatusNet::loadConfigFile($conffile);
+ $sprofile = common_config('site', 'profile');
+ if (!empty($sprofile)) {
+ StatusNet::loadSiteProfile($sprofile);
+ }
// Load settings from database; note we need autoload for this
Config::loadSettings();
$config['db'] = $default['db'];
- // Backward compatibility
-
- $config['site']['design'] =& $config['design'];
-
if (function_exists('date_default_timezone_set')) {
/* Work internally in UTC */
date_default_timezone_set('UTC');
}
}
+ public static function loadSiteProfile($name)
+ {
+ global $config;
+ $settings = SiteProfile::getSettings($name);
+ $config = array_replace($config, $settings);
+ }
+
protected function _sn_to_path($sn)
{
$past_root = substr($sn, 1);
$config_files);
}
- // Fixup for statusnet.ini
- $_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1);
-
- if ($_db_name != 'statusnet' && !array_key_exists('ini_'.$_db_name, $config['db'])) {
- $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/statusnet.ini';
- }
-
// Backwards compatibility
if (array_key_exists('memcached', $config)) {
if ($config['memcached']['enabled']) {