Merge branch 'master' of github.com:vichan-devel/Tinyboard

This commit is contained in:
czaks 2016-08-14 16:24:25 +02:00
commit 1c24c69999

View File

@ -302,15 +302,15 @@ if (isset($_POST['delete'])) {
markup($reason);
foreach ($report as &$id) {
$query = prepare(sprintf("SELECT `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
$query = prepare(sprintf("SELECT `id`, `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
$query->bindValue(':id', $id, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
$thread = $query->fetchColumn();
$post = $query->fetch(PDO::FETCH_ASSOC);
if ($config['syslog'])
_syslog(LOG_INFO, 'Reported post: ' .
'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($thread ? '#' . $id : '') .
'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '') .
' for "' . $reason . '"'
);
$query = prepare("INSERT INTO ``reports`` VALUES (NULL, :time, :ip, :board, :post, :reason)");
@ -780,7 +780,7 @@ if (isset($_POST['delete'])) {
error($config['error']['nomove']);
if ($md5cmd) {
$output = shell_exec_error($md5cmd . " < " . escapeshellarg($upload));
$output = shell_exec_error($md5cmd . " " . escapeshellarg($upload));
$output = explode(' ', $output);
$hash = $output[0];
}