diff options
| author | czaks <marcin@6irc.net> | 2013-08-17 16:22:04 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-17 16:22:04 -0400 |
| commit | ff479e8bcbf2c9535bd614442ae62858fdd870ec (patch) | |
| tree | 07bf06f834efa9bd1300fe104b5a68e3ca47ddfc /inc | |
| parent | bf119b7abd1f37a2871be7cf652adbcd37486a1e (diff) | |
| parent | 5c2ec21e139ab6be4dcf5d5a5d548f402594f39d (diff) | |
Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/config.php | 15 | ||||
| -rw-r--r-- | inc/display.php | 3 |
2 files changed, 10 insertions, 8 deletions
diff --git a/inc/config.php b/inc/config.php index 686894d1..e9e52aaf 100644 --- a/inc/config.php +++ b/inc/config.php @@ -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; /* * ==================== diff --git a/inc/display.php b/inc/display.php index 0f1bc195..9009be9a 100644 --- a/inc/display.php +++ b/inc/display.php @@ -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, |