mirror_php/Tinyboard
1
0
Fork 0
mirror of https://github.com/Circlepuller/Tinyboard.git synced 2025-04-24 08:23:14 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Updating to a more recent upstream for sanity.
This commit is contained in:
Daniel Saunders 2017-10-26 00:45:09 -04:00
commit 9e8e56f449
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/mod/pages.php
View File

@ -1547,7 +1547,7 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
else
$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name, `email` = :email, `subject` = :subject, `body_nomarkup` = :body WHERE `id` = :id', $board));
$query->bindValue(':id', $postID);
$query->bindValue('name', $_POST['name']);
$query->bindValue(':name', $_POST['name']);
$query->bindValue(':email', $_POST['email']);
$query->bindValue(':subject', $_POST['subject']);
$query->bindValue(':body', $_POST['body']);

6
install.php
View File

@ -593,7 +593,7 @@ if (file_exists($config['has_installed'])) {
`extra` varchar(200),
`text` varchar(255),
`created_at` int(11),
PRIMARY KEY (`cookie`,`extra`),
PRIMARY KEY (`cookie`,`extra`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;') or error(db_error());
case false:
// TODO: enhance Tinyboard -> vichan upgrade path.
@ -900,6 +900,10 @@ if ($step == 0) {
$instance_config .= "\n";
if (@file_put_contents('inc/instance-config.php', $instance_config)) {
// flushes opcache if php >= 5.5.0 or opcache is installed via PECL
if (function_exists('opcache_invalidate')) {
opcache_invalidate('inc/instance-config.php');
}
header('Location: ?step=4', true, $config['redirect_http']);
} else {
$page['title'] = 'Manual installation required';

8
js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
js/thread-watcher.js
View File

@ -150,8 +150,8 @@ $(document).ready(function(){
//Append the watchlist toggle button.
$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
//Append a watch thread button after every OP.
$('.op>.intro').append('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
//Append a watch thread button after every OP post number.
$('.op>.intro>.post_no:odd').after('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
//Draw the watchlist, hidden.
watchlist.render();

3
post.php
View File

@ -287,9 +287,6 @@ if (isset($_POST['delete'])) {
if (empty($report))
error($config['error']['noreport']);
if (strlen($report) > 30)
error($config['error']['invalidreport']);
if (count($report) > $config['report_limit'])
error($config['error']['toomanyreports']);

4
templates/index.html
View File

@ -57,8 +57,8 @@
{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
<hr />
<!-- Start Search Form -->
{% if config.board_search %}
<!-- Start Search Form -->
<form style="display:inline" action="/search.php">
<p style="margin: 10px;">
<input type="text" name="search" placeholder="{{ board.uri }} search">
@ -66,8 +66,8 @@
<input type="submit" value="Search">
</p>
</form>
{% endif %}
<!-- End Search Form -->
{% endif %}
<form name="postcontrols" action="{{ config.post_url }}" method="post">
<input type="hidden" name="board" value="{{ board.uri }}" />
{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}