summaryrefslogtreecommitdiff
path: root/inc/api.php
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2014-09-26 14:08:40 +0200
committerczaks <marcin@6irc.net>2014-09-26 14:08:40 +0200
commitb4b99cd9369c6418534536c5eb5b7b127ab55dfa (patch)
treec6d651753c0461ba2eaa04c34f633b82e148c2f2 /inc/api.php
parent359c295ecaf079318d55b1acc6e900ee74feb6d3 (diff)
parentbfb85fc2b19bcc895bd0034d0d7a9d7b64f481f4 (diff)
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts: stylesheets/style.css
Diffstat (limited to 'inc/api.php')
-rw-r--r--inc/api.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/api.php b/inc/api.php
index a8ae9eed..3769a9c9 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -41,8 +41,8 @@ class Api {
);
$this->fileFields = array(
- 'thumbheight' => 'tn_w',
- 'thumbwidth' => 'tn_h',
+ 'thumbheight' => 'tn_h',
+ 'thumbwidth' => 'tn_w',
'height' => 'w',
'width' => 'h',
'size' => 'fsize',
@@ -113,6 +113,7 @@ class Api {
$apiPost['ext'] = substr($file->file, $dotPos);
$dotPos = strrpos($file->file, '.');
$apiPost['tim'] = substr($file->file, 0, $dotPos);
+ $apiPost['md5'] = base64_encode(md5_file($file->file_path, true));
}
return $apiPost;