summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/functions.php11
-rw-r--r--post.php3
-rw-r--r--templates/banned.html4
3 files changed, 6 insertions, 12 deletions
diff --git a/inc/functions.php b/inc/functions.php
index b8198522..9d55f2f2 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -689,22 +689,15 @@ function displayBan($ban) {
}
$ban['ip'] = $_SERVER['REMOTE_ADDR'];
+
if ($ban['post'] && isset($ban['post']['board'], $ban['post']['id'])) {
if (openBoard($ban['post']['board'])) {
-
- $query = query(sprintf("SELECT `thumb`, `file` FROM ``posts_%s`` WHERE `id` = " .
+ $query = query(sprintf("SELECT `files` FROM ``posts_%s`` WHERE `id` = " .
(int)$ban['post']['id'], $board['uri']));
if ($_post = $query->fetch(PDO::FETCH_ASSOC)) {
$ban['post'] = array_merge($ban['post'], $_post);
- } else {
- $ban['post']['file'] = 'deleted';
- $ban['post']['thumb'] = false;
}
- } else {
- $ban['post']['file'] = 'deleted';
- $ban['post']['thumb'] = false;
}
-
if ($ban['post']['thread']) {
$post = new Post($ban['post']);
} else {
diff --git a/post.php b/post.php
index 133ecd27..9d63d7fa 100644
--- a/post.php
+++ b/post.php
@@ -568,7 +568,8 @@ if (isset($_POST['delete'])) {
}
if ($output = shell_exec_error("cat $filenames | md5sum")) {
- $hash = explode(' ', $output)[0];
+ $explodedvar = explode(' ', $output);
+ $hash = $explodedvar[0];
$post['filehash'] = $hash;
} elseif ($config['max_images'] === 1) {
$post['filehash'] = md5_file($upload);
diff --git a/templates/banned.html b/templates/banned.html
index 1a9a3915..33f9d9f8 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -83,7 +83,7 @@
{% if post and config.ban_show_post %}
<hr>
- <p>{% trans %}You were banned for the following post on {% endtrans %}{{ board.url }}:</p>
+ <p>{% trans %}You were banned for the following post on{% endtrans %} {{ board.url }}:</p>
{{ post }}
<br>
{% endif %}
@@ -133,4 +133,4 @@
{% endif %}
{% endif %}
</div>
-{% endfilter %} \ No newline at end of file
+{% endfilter %}