natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse Source 
Conflicts:
	install.php
This commit is contained in:
czaks
2013-09-01 11:25:19 -04:00
parent c240056865 22fcca343f
commit 069f1def9b
13 changed files with 173 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
post.php
View File

@@ -429,6 +429,12 @@ if (isset($_POST['delete'])) {
error(sprintf($config['error']['toolong'], 'password'));
wordfilters($post['body']);
// Check for a flood
if (!hasPermission($config['mod']['flood'], $board['uri']) && checkFlood($post)) {
error($config['error']['flood']);
}
$post['body'] = escape_markup_modifiers($post['body']);
if ($mod && isset($post['raw']) && $post['raw']) {
@@ -465,11 +471,6 @@ if (isset($_POST['delete'])) {
$post['tracked_cites'] = markup($post['body'], true);
// Check for a flood
if (!hasPermission($config['mod']['flood'], $board['uri']) && checkFlood($post)) {
error($config['error']['flood']);
}
require_once 'inc/filters.php';
do_filters($post);
@@ -691,7 +692,7 @@ if (isset($_POST['delete'])) {
$pdo->quote($board['uri']) . ', ' . (int)$id . ', ' .
$pdo->quote($cite[0]) . ', ' . (int)$cite[1] . ')';
}
query('INSERT INTO ``cites`` VALUES ' . implode(', ', $insert_rows)) or error(db_error());;
query('INSERT INTO ``cites`` VALUES ' . implode(', ', $insert_rows)) or error(db_error());
}
if (!$post['op'] && strtolower($post['email']) != 'sage' && !$thread['sage'] && ($config['reply_limit'] == 0 || $numposts['replies']+1 < $config['reply_limit'])) {