summaryrefslogtreecommitdiff
path: root/post.php
diff options
context:
space:
mode:
authorMarcin Łabanowski <marcin@6irc.net>2014-09-17 20:50:21 +0200
committerMarcin Łabanowski <marcin@6irc.net>2014-09-17 20:50:21 +0200
commit4da5f4ec90b80efd0ebb4a163e6f3648d0709bc9 (patch)
treef3244ae5ae92c90c86f650c84718b4f593c915e9 /post.php
parentc369377c84d370efe0da66e348cb337b33158e92 (diff)
parent306f4ef46bcbede59b427268fe6d8b5e18c811b2 (diff)
Merge pull request #79 from marlencrabapple/master
FFmpeg support for WebM uploads
Diffstat (limited to 'post.php')
-rw-r--r--post.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/post.php b/post.php
index d6dfdaa1..033e5ab5 100644
--- a/post.php
+++ b/post.php
@@ -566,7 +566,9 @@ if (isset($_POST['delete'])) {
error($config['error']['nomove']);
}
- if ($output = shell_exec_error("cat $filenames | md5sum")) {
+ $md5cmd = $config['bsd_md5'] ? 'md5 -r' : 'md5sum';
+
+ if ($output = shell_exec_error("cat $filenames | $md5cmd")) {
$explodedvar = explode(' ', $output);
$hash = $explodedvar[0];
$post['filehash'] = $hash;
@@ -925,4 +927,3 @@ if (isset($_POST['delete'])) {
error($config['error']['nopost']);
}
}
-