[CORE] Avatars are in PUBLICDIR in v2
Fixed a bug in the Installer
This commit is contained in:
parent
893bafa14b
commit
e0bc35b975
@ -146,7 +146,7 @@ $default =
|
|||||||
array('jpegquality' => 85),
|
array('jpegquality' => 85),
|
||||||
'avatar' =>
|
'avatar' =>
|
||||||
array('server' => null,
|
array('server' => null,
|
||||||
'dir' => INSTALLDIR . '/avatar/',
|
'dir' => PUBLICDIR . '/avatar/',
|
||||||
'path' => $_path . '/avatar/',
|
'path' => $_path . '/avatar/',
|
||||||
'ssl' => null,
|
'ssl' => null,
|
||||||
'maxsize' => 300),
|
'maxsize' => 300),
|
||||||
|
@ -164,6 +164,11 @@ abstract class Installer
|
|||||||
unset($default);
|
unset($default);
|
||||||
foreach ($fileSubdirs as $fileFullPath) {
|
foreach ($fileSubdirs as $fileFullPath) {
|
||||||
if (!file_exists($fileFullPath)) {
|
if (!file_exists($fileFullPath)) {
|
||||||
|
$this->warning(
|
||||||
|
sprintf('GNU social was unable to create a directory on this path: %s', $fileFullPath),
|
||||||
|
'Either create that directory with the right permissions so that GNU social can use it or '.
|
||||||
|
'set the necessary permissions and it will be created.'
|
||||||
|
);
|
||||||
$pass = $pass && mkdir($fileFullPath);
|
$pass = $pass && mkdir($fileFullPath);
|
||||||
} elseif (!is_dir($fileFullPath)) {
|
} elseif (!is_dir($fileFullPath)) {
|
||||||
$this->warning(
|
$this->warning(
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
define('INSTALLDIR', dirname(__DIR__));
|
define('INSTALLDIR', dirname(__DIR__));
|
||||||
|
define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
|
||||||
|
|
||||||
require INSTALLDIR . '/lib/installer.php';
|
require INSTALLDIR . '/lib/installer.php';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user