summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2014-05-28 15:37:36 +0200
committerczaks <marcin@6irc.net>2014-05-28 15:37:36 +0200
commitc04b4196394b68a1a2105ebc8011460826f56c34 (patch)
tree0283abd6757a8994c943b2fcf3daa0bf61be7fe2
parent3ba152e0a194aaf3dae82dbcf33f4ceaa07c4d2d (diff)
parent073e6bec83982456454a8e9bf06cfae23fc0e690 (diff)
Merge branch 'master' of github.com:vichan-devel/Tinyboard
-rw-r--r--inc/display.php3
-rw-r--r--js/expand-too-long.js2
-rw-r--r--post.php2
3 files changed, 4 insertions, 3 deletions
diff --git a/inc/display.php b/inc/display.php
index ab2daeb6..e5ce1da1 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -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(
'config' => $config,
diff --git a/js/expand-too-long.js b/js/expand-too-long.js
index 23921eaf..e768aa27 100644
--- a/js/expand-too-long.js
+++ b/js/expand-too-long.js
@@ -23,7 +23,7 @@ $(function() {
url: url,
context: document.body,
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);
}
diff --git a/post.php b/post.php
index ba6a7a73..d1c2b086 100644
--- a/post.php
+++ b/post.php
@@ -324,7 +324,7 @@ if (isset($_POST['delete'])) {
curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
if (curl_exec($curl) === false)
- error($config['error']['nomove']);
+ error($config['error']['nomove'] . '<br/>Curl says: ' . curl_error($curl));
curl_close($curl);