Merge remote-tracking branch 'upstream/master' into social-master

diff --combined classes/File_thumbnail.php
index 7b610395cdccb23e0451cf9b8d7d6518cc95662e,a2e633249f950c345b54b9bbd80ce713200929a4..7acc8a4cde924a4ac2d54e01146613f71ae4d52c
--- 1/classes/File_thumbnail.php
--- 2/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@@ -28,7 -28,7 +28,7 @@@ class File_thumbnail extends Managed_Da
      public $__table = 'file_thumbnail';                  // table name
      public $file_id;                         // int(4)  primary_key not_null
      public $url;                             // text
-     public $filename;                        // varchar(191)   not 255 because utf8mb4 takes more space
+     public $filename;                        // text
      public $width;                           // int(4)  primary_key
      public $height;                          // int(4)  primary_key
      public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@@ -39,7 -39,7 +39,7 @@@
              'fields' => array(
                  'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
                  'url' => array('type' => 'text', 'not null' => false, 'description' => 'URL of thumbnail'),
-                 'filename' => array('type' => 'varchar', 'length' => 191, 'description' => 'if stored locally, filename is put here'),
+                 'filename' => array('type' => 'text', 'description' => 'if stored locally, filename is put here'),
                  'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
                  'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
                  'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
@@@ -61,9 -61,6 +61,9 @@@
       * @param int $file_id
       */
      public static function saveNew($data, $file_id) {
 +        // @TODO Must be an object (see below code)
 +        assert(is_object($data));
 +
          if (!empty($data->thumbnail_url)) {
              // Non-photo types such as video will usually
              // show us a thumbnail, though it's not required.

diff --combined lib/default.php
index 6d9f3c14fa94bf1b8437d7f5a05aefe38a82ca2d,5f4b806b81b8df9fdc745209f5a29fc92eb8e190..ff0f9dab195cbf75e6457e893d0944fa9016c56a
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -132,7 -132,7 +132,7 @@@ $default 
                'delete' => false,
                'move' => true),
          'image' =>
 -        array('jpegquality' => 85),
 +        array('jpegquality' => 95),
          'avatar' =>
          array('server' => null,
                'dir' => INSTALLDIR . '/avatar/',
@@@ -181,7 -181,7 +181,7 @@@
          array('dropoff' => 864000.0,   # controls weighting based on age
                'cutoff' => 86400 * 90), # only look at notices favorited in last 90 days
          'daemon' =>
-         array('piddir' => '/var/run',
+         array('piddir' => sys_get_temp_dir(),
                'user' => false,
                'group' => false),
          'emailpost' =>
@@@ -214,7 -214,6 +214,7 @@@
          array('server' => null,
                'dir' => INSTALLDIR . '/file/',
                'path' => $_path . '/file/',
 +              'chmod' => 0644,        // Access rights (chmod) for any attachments
                'sslserver' => null,
                'sslpath' => null,
                'ssl' => null,