diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-10-14 15:27:17 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-10-14 15:27:17 -0400 |
| commit | 0721d8d3e257709d27994eb4ab4bbe60abc93e2e (patch) | |
| tree | 58cb9e3b5f8df089353617b498c340ad9276519b /lib/default.php | |
| parent | f79dbaf9a76c10969dbc45fd43a0bb26f5f64ed4 (diff) | |
| parent | fc6711327bcb2319139171ad3353603753f13eaa (diff) | |
Merge remote branch 'statusnet/0.9.x' into 1.0.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/default.php b/lib/default.php index 79b54fc3b..279a7a3d1 100644 --- a/lib/default.php +++ b/lib/default.php @@ -37,6 +37,7 @@ $default = 'path' => $_path, 'logfile' => null, 'logo' => null, + 'ssllogo' => null, 'logdebug' => false, 'fancy' => false, 'locale_path' => INSTALLDIR.'/locale', @@ -210,6 +211,8 @@ $default = array('server' => null, 'dir' => INSTALLDIR . '/file/', 'path' => $_path . '/file/', + 'sslserver' => null, + 'sslpath' => null, 'ssl' => null, 'supported' => array('image/png', 'image/jpeg', |