diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-25 22:47:23 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-25 22:47:23 -0400 |
| commit | 76aa85fe5ef408cecf7c40c0c56d58ff9ac9fcbb (patch) | |
| tree | f2bd52d08e421f934bc8466ab1ecb4facbbcc6a5 /lib/common.php | |
| parent | b140bcdee4b1f4c8f2f34a89a9c5c51e7ecfe826 (diff) | |
| parent | 68d90bcab04713d53cf3731d45729a617e68a2fa (diff) | |
Merge branch '0.8.x' into stats
Conflicts:
README
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 e64ca34da..0ce46442d 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 @@ -197,7 +199,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; } |