Merge branch 'master' of github.com:vichan-devel/Tinyboard

This commit is contained in:
czaks 2014-05-28 15:37:36 +02:00
commit c04b419639
3 changed files with 4 additions and 3 deletions

View File

@ -118,7 +118,8 @@ function error($message, $priority = true, $debug_stuff = false) {
}; };
$debug_stuff = array_filter($debug_stuff, $debug_callback); if ($debug_stuff)
$debug_stuff = array_filter($debug_stuff, $debug_callback);
die(Element('page.html', array( die(Element('page.html', array(
'config' => $config, 'config' => $config,

View File

@ -23,7 +23,7 @@ $(function() {
url: url, url: url,
context: document.body, context: document.body,
success: function(data) { success: function(data) {
var content = $(data).find('#'+url.split('#')[1]).next().html(); var content = $(data).find('#'+url.split('#')[1]).next().next().html();
body.html(content); body.html(content);
} }

View File

@ -324,7 +324,7 @@ if (isset($_POST['delete'])) {
curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
if (curl_exec($curl) === false) if (curl_exec($curl) === false)
error($config['error']['nomove']); error($config['error']['nomove'] . '<br/>Curl says: ' . curl_error($curl));
curl_close($curl); curl_close($curl);