diff options
| author | Zach Copley <zach@status.net> | 2010-02-15 21:14:32 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-15 21:14:32 +0000 |
| commit | 5db40c440dcfa3f9d19f047c003bbcfaeb69dbc9 (patch) | |
| tree | a6b86448b61ddeecfc0abdc5a13f1eca5723a3e1 /lib/default.php | |
| parent | 5cc1f8b001057e9c4301b173391a7f0a5415f153 (diff) | |
| parent | f5c69dfbf946438fbe1f472de3adb4514db8d090 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/default.php b/lib/default.php index bf4b83718..8b1fe2769 100644 --- a/lib/default.php +++ b/lib/default.php @@ -111,11 +111,13 @@ $default = 'avatar' => array('server' => null, 'dir' => INSTALLDIR . '/avatar/', - 'path' => $_path . '/avatar/'), + 'path' => $_path . '/avatar/', + 'ssl' => null), 'background' => array('server' => null, 'dir' => INSTALLDIR . '/background/', - 'path' => $_path . '/background/'), + 'path' => $_path . '/background/', + 'ssl' => null), 'public' => array('localonly' => true, 'blacklist' => array(), @@ -123,10 +125,12 @@ $default = 'theme' => array('server' => null, 'dir' => null, - 'path'=> null), + 'path'=> null, + 'ssl' => null), 'javascript' => array('server' => null, - 'path'=> null), + 'path'=> null, + 'ssl' => null), 'throttle' => array('enabled' => false, // whether to throttle edits; false by default 'count' => 20, // number of allowed messages in timespan @@ -184,6 +188,7 @@ $default = array('server' => null, 'dir' => INSTALLDIR . '/file/', 'path' => $_path . '/file/', + 'ssl' => null, 'supported' => array('image/png', 'image/jpeg', 'image/gif', |