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

don't allow showing of metadata at all if exif_read_data is undefined

Browse Source
This commit is contained in:
Shish 2012-03-14 20:24:34 +00:00
parent d820f9a927
commit 0be4f83e4e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/handle_pixel/theme.php
View File

@ -6,7 +6,7 @@ class PixelFileHandlerTheme extends Themelet {
$u_ilink = $image->get_image_link(); $u_ilink = $image->get_image_link();
$html = "<img alt='main image' id='main_image' src='$u_ilink'>"; $html = "<img alt='main image' id='main_image' src='$u_ilink'>";
if($config->get_bool("image_show_meta")) { if($config->get_bool("image_show_meta") && function_exists("exif_read_data")) {
# FIXME: only read from jpegs? # FIXME: only read from jpegs?
$exif = @exif_read_data($image->get_image_filename(), 0, true); $exif = @exif_read_data($image->get_image_filename(), 0, true);
if($exif) { if($exif) {

4
ext/image/main.php
View File

@ -139,7 +139,9 @@ class ImageIO extends Extension {
$config->set_default_int('thumb_mem_limit', parse_shorthand_int('8MB')); $config->set_default_int('thumb_mem_limit', parse_shorthand_int('8MB'));
$config->set_default_string('thumb_convert_path', 'convert.exe'); $config->set_default_string('thumb_convert_path', 'convert.exe');
$config->set_default_bool('image_show_meta', false); if(function_exists("exif_read_data")) {
$config->set_default_bool('image_show_meta', false);
}
$config->set_default_bool('image_jquery_confirm', true); $config->set_default_bool('image_jquery_confirm', true);
$config->set_default_string('image_ilink', ''); $config->set_default_string('image_ilink', '');
$config->set_default_string('image_tlink', ''); $config->set_default_string('image_tlink', '');