james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #571 from im-mi/develop

Browse Source 
Clean up a few superficial errors
This commit is contained in:
Shish 2016-08-20 14:56:18 +01:00 committed by GitHub
commit 61b86da5fe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -48,9 +48,9 @@
AddOutputFilterByType DEFLATE application/x-javascript application/javascript AddOutputFilterByType DEFLATE application/x-javascript application/javascript
</ifmodule> </ifmodule>
DefaultType image/jpeg
AddType audio/mp4 f4a f4b m4a AddType audio/mp4 f4a f4b m4a
AddType audio/ogg oga ogg opus AddType audio/ogg oga ogg opus
AddType image/jpeg jpg jpeg
AddType image/bmp bmp AddType image/bmp bmp
AddType image/svg+xml svg svgz AddType image/svg+xml svg svgz
AddType image/webp webp AddType image/webp webp

4
ext/upload/main.php
View File

@ -291,7 +291,7 @@ class Upload extends Extension {
/** /**
* Handle an upload. * Handle an upload.
* @param string $file * @param string[] $file
* @param string[] $tags * @param string[] $tags
* @param string|null $source * @param string|null $source
* @param int $replace * @param int $replace
@ -299,7 +299,7 @@ class Upload extends Extension {
*/ */
private function try_upload($file, $tags, $source, $replace=-1) { private function try_upload($file, $tags, $source, $replace=-1) {
global $page; global $page;
assert('is_string($file)'); assert('is_array($file)');
assert('is_array($tags)'); assert('is_array($tags)');
assert('is_string($source) || is_null($source)'); assert('is_string($source) || is_null($source)');
assert('is_int($replace)'); assert('is_int($replace)');