badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

images aren't always jpg, so don't force jpg

Browse source 
all the handle_* exts use this as well, which can cause issues
This commit is contained in:
Daku 2016-05-14 22:56:08 +01:00
parent 2070034d0d
commit dd105e174e
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.htaccess
View file

@ -31,8 +31,6 @@
php_flag magic_quotes_runtime 0 php_flag magic_quotes_runtime 0
</IfModule> </IfModule>
DefaultType image/jpeg
<IfModule mod_expires.c> <IfModule mod_expires.c>
ExpiresActive On ExpiresActive On
<FilesMatch "([0-9a-f]{32}|\.(gif|jpe?g|png|css|js))$"> <FilesMatch "([0-9a-f]{32}|\.(gif|jpe?g|png|css|js))$">
@ -49,3 +47,14 @@ DefaultType image/jpeg
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
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/ogg oga ogg opus
AddType image/bmp bmp
AddType image/svg+xml svg svgz
AddType image/webp webp
AddType video/mp4 f4v f4p m4v mp4
AddType video/ogg ogv
AddType video/webm webm
AddType video/x-flv flv

2
core/imageboard.pack.php
View file

@ -388,7 +388,7 @@ class Image {
* @return string * @return string
*/ */
public function get_image_link() { public function get_image_link() {
return $this->get_link('image_ilink', '_images/$hash/$id%20-%20$tags.$ext', 'image/$id.jpg'); return $this->get_link('image_ilink', '_images/$hash/$id%20-%20$tags.$ext', 'image/$id.$ext');
} }
/** /**