Merge branch '0.8.x' into userdesign

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

diff --git a/lib/common.php b/lib/common.php
index eb3bf4e4dc3cf3ff9c787ce37926b3d29ab2ae4d..1381d80477f2506322abe96ed95fc3bb2412ff60 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -116,7 +116,9 @@ $config =
         'profile' =>
         array('banned' => array()),
         'avatar' =>
-        array('server' => null),
+        array('server' => null,
+              'dir' => INSTALLDIR . '/avatar/',
+              'path' => $_path . '/avatar/'),
         'public' =>
         array('localonly' => true,
               'blacklist' => array(),
@@ -158,6 +160,7 @@ $config =
         'memcached' =>
         array('enabled' => false,
               'server' => 'localhost',
+              'base' => null,
               'port' => 11211),
                'ping' =>
         array('notify' => array()),