diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-15 11:40:40 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-15 11:40:40 -0700 |
| commit | 4c3aebd39644d913df4abdb69b848413ca65c298 (patch) | |
| tree | 5356dcfd6f4bc43768f4b66ef4a207ac04ae1b6d /lib/default.php | |
| parent | 71ed82ed9656618873dde4e41314de29158e5fe9 (diff) | |
| parent | a7d98435f649da268f728825e64eb673c451e242 (diff) | |
Merge branch '1.0.x' into schema-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', |