perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Browse source 
Conflicts:
	inc/config.php
This commit is contained in:
czaks 2013-09-17 19:12:19 -04:00
commit 8ca495e5b8
5 changed files with 54 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
inc/functions.php
View file

@ -620,22 +620,41 @@ function ago($timestamp) {
}
function displayBan($ban) {
global $config;
global $config, $board;
if (!$ban['seen']) {
Bans::seen($ban['id']);
}
$ban['ip'] = $_SERVER['REMOTE_ADDR'];
if ($ban['post'] && isset($ban['post']['board'], $ban['post']['id'])) {
openBoard($ban['post']['board']);
$query = query(sprintf("SELECT `thumb`, `file` 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;
}
if ($ban['post']['thread']) {
$post = new Post($ban['post']);
} else {
$post = new Thread($ban['post'], null, false, false);
}
}
// Show banned page and exit
die(
Element('page.html', array(
'title' => _('Banned!'),
'config' => $config,
'nojavascript' => true,
'body' => Element('banned.html', array(
'config' => $config,
'ban' => $ban
'ban' => $ban,
'board' => $board,
'post' => isset($post) ? $post->build(true) : false
)
))
));