background folder has never been used for GNU social

diff --git a/.gitignore b/.gitignore
index 41084c45cd1cf2e0a198bef83e7fffcc2cf1d5ae..102173e832708f11078f366b3ec8fb8ceca3f51b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 avatar/*
-background/*
 files/*
 file/*
 local/*

diff --git a/lib/default.php b/lib/default.php
index 7894dbb6745e4027be32f9351119f171fce0cce2..5b504cea3f84e0a4ab47a5913a0bfbe28a83fdc8 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,11 +140,6 @@ $default =
               'path' => $_path . '/avatar/',
               'ssl' => null,
               'maxsize' => 300),
-        'background' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/',
-              'ssl' => null),
         'public' =>
         array('localonly' => false,
               'blacklist' => array(),

diff --git a/lib/installer.php b/lib/installer.php
index 738eb80472d46a4bced35a4fb234ee3395a9853e..5e09c9732924253fd68136b222a8abb8a03d697a 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -133,7 +133,7 @@ abstract class Installer
         }
 
         // Check the subdirs used for file uploads
-        $fileSubdirs = array('avatar', 'background', 'file');
+        $fileSubdirs = array('avatar', 'file');
         foreach ($fileSubdirs as $fileSubdir) {
             $fileFullPath = INSTALLDIR."/$fileSubdir/";
             if (!is_writable($fileFullPath)) {