diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-11 17:53:23 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-11 17:53:23 -0400 |
| commit | 99f8501d321ae9d8087abbe6523e28ce5fd095d3 (patch) | |
| tree | fb721b4360f0748df3cb3b522565ad4566422555 /lib/common.php | |
| parent | 7f0e57598a5837bbb87f197baa147be29c7df531 (diff) | |
| parent | 251fd2c232d96ea09db971a6608231c679395c01 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Conflicts:
config.php.sample
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php index 3f8123c51..3feba1d8b 100644 --- a/lib/common.php +++ b/lib/common.php @@ -143,6 +143,8 @@ $config = array('piddir' => '/var/run', 'user' => false, 'group' => false), + 'twitterbridge' => + array('enabled' => false), 'integration' => array('source' => 'Laconica', # source attribute for Twitter 'taguri' => $_server.',2009'), # base for tag URIs @@ -193,7 +195,7 @@ $_config_files[] = INSTALLDIR.'/config.php'; $_have_a_config = false; foreach ($_config_files as $_config_file) { - if (file_exists($_config_file)) { + if (@file_exists($_config_file)) { include_once($_config_file); $_have_a_config = true; } |