Merge remote branch 'statusnet/0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index 79b54fc3bddb8e216a2efd8a62d2de847fc2d1c5..279a7a3d11f0106949052c90298bfaeb8eb74291 100644 (file)
--- 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',