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

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

Browse Source
This commit is contained in:
czaks
2013-08-17 16:22:04 -04:00
parent bf119b7abd 5c2ec21e13
commit ff479e8bcb
10 changed files with 1087 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
inc/config.php
View File

@@ -642,15 +642,14 @@
// Allow unfiltered HTML in board subtitle. This is useful for placing icons and links.
$config['allow_subtitle_html'] = false;
/*
* Enable oekaki (お絵描き). This puts a drawing field on your board. You can either
* enable it globally or enable it on a per-board basis. Oekaki's color field
* can be greatly enhanced by installing jscolor from http://jscolor.com/ and installing it in js/
* If you enable oekaki, please remember to also enable its script with:
* $config['additional_javascript'][] = 'js/oekaki.js';
*/
// Oekaki - To enable oekaki, just enable its script with:
// $config['additional_javascript'][] = 'js/oekaki.js';
// Color selection in oekaki can be greatly improved by including the bundled jscolor script.
// $config['additional_javascript'][] = 'js/jscolor/jscolor.js';
// $config['oekaki'] holds Oekaki options, which are currently just default canvas size.
$config['oekaki'] = false;
$config['oekaki']['height'] = 250;
$config['oekaki']['width'] = 500;
/*
* ====================

3
inc/display.php
View File

@@ -74,6 +74,9 @@ function error($message, $priority = true, $debug_stuff = false) {
if ($config['debug'] && isset($db_error)) {
$debug_stuff = array_combine(array('SQLSTATE', 'Error code', 'Error message'), $db_error);
}
// Return the bad request header, necessary for AJAX posts
http_response_code(400);
die(Element('page.html', array(
'config' => $config,