Merge remote-tracking branch 'upstream/nightly' into nightly

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

diff --git a/lib/gnusocial.php b/lib/gnusocial.php
index f07d2c24468e46d34fa1e67ac695b4f04fb851c8..789cece2bea924d2c04e35a60e3e926df000e762 100644 (file)
--- a/lib/gnusocial.php
+++ b/lib/gnusocial.php
@@ -141,6 +141,7 @@ class GNUsocial
         // Load settings from database; note we need autoload for this
         Config::loadSettings();
 
+        self::fillConfigVoids();
         self::verifyLoadedConfig();
 
         self::initPlugins();
@@ -420,6 +421,14 @@ class GNUsocial
         }
     }
 
+    static function fillConfigVoids()
+    {
+        // special cases on empty configuration options
+        if (!common_config('thumbnail', 'dir')) {
+            common_config_set('thumbnail', 'dir', File::path('thumb'));
+        }
+    }
+
     /**
      * Verify that the loaded config is good. Not complete, but will
      * throw exceptions on common configuration problems I hope.
@@ -452,6 +461,9 @@ class GNUsocial
             if (!mkdir($dir)) {
                 throw new ConfigException('Could not create directory for '._ve($description).': '._ve($dir));
             }
+            if (!chmod($dir, 0775)) {
+                common_log(LOG_WARNING, 'Could not chmod 0775 on directory for '._ve($description).': '._ve($dir));
+            }
         }
 
         if (!is_array(common_config('public', 'autosource'))) {