diff options
| author | Mario <mario@mariovavti.com> | 2017-12-27 16:45:33 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-12-27 16:45:33 +0100 |
| commit | 4a71fb08315b2b785114d90318adb51f6fa78472 (patch) | |
| tree | bbc0b4fa95ad236135af7ec70abee76901b82c79 /Zotlabs | |
| parent | 8e626a0142e586da7f1bfbf5d35a518159e75b88 (diff) | |
| parent | 5a8efc10d8ebaf5e81009eaaff8b0c5524a04aa3 (diff) | |
| download | volse-hubzilla-4a71fb08315b2b785114d90318adb51f6fa78472.tar.gz volse-hubzilla-4a71fb08315b2b785114d90318adb51f6fa78472.tar.bz2 volse-hubzilla-4a71fb08315b2b785114d90318adb51f6fa78472.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Thumbs/Video.php | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 63ff4341c..510d463c1 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -691,7 +691,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo } $prefix = ''; - $suffix = ''; + $suffix = ' order by is_dir desc, filename asc '; $r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix", dbesc($folder), diff --git a/Zotlabs/Thumbs/Video.php b/Zotlabs/Thumbs/Video.php index 5e09ef9a3..d0f72bcdd 100644 --- a/Zotlabs/Thumbs/Video.php +++ b/Zotlabs/Thumbs/Video.php @@ -32,12 +32,18 @@ class Video { fclose($ostream); } + /* + * Note: imagick convert may try to call 'ffmpeg' (or other conversion utilities) under + * the covers for this particular operation. If this is not installed or not in the path + * for the web server user, errors may be reported in the web server logs. + */ + $imagick_path = get_config('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path)) { $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); // logger('imagick thumbnail command: ' . $cmd); - exec($cmd); + @exec($cmd); if(! file_exists($outfile)) { logger('imagick scale failed.'); |