aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaurent.duretz <laurent.duretz@piwigo.org>2010-03-01 13:02:49 +0000
committerlaurent.duretz <laurent.duretz@piwigo.org>2010-03-01 13:02:49 +0000
commit2c2cfa0899695993c17867c52c4690d46fbfbadc (patch)
tree65767523483bd6070bfe90af49e3014c9b9b5a6b
parentab21bfa8c53f7442adc203b568235d99edadb5a4 (diff)
Issue 1471 : incomplete test correction
git-svn-id: http://piwigo.org/svn/branches/2.0@5012 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--tools/create_listing_file.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php
index 4f0306673..a3bb243b3 100644
--- a/tools/create_listing_file.php
+++ b/tools/create_listing_file.php
@@ -207,7 +207,7 @@ function pwg_check_graphics()
list($pwg_conf['gd_version_major']) = preg_split('/[.]+/', $pwg_conf['gd_version_full']);
// Backup input/output format support
- array_push($pwg_conf['gd_supported_format'], isset($info['JPG Support']) or isset($info['JPEG Support']) ? 'jpeg' : NULL);
+ array_push($pwg_conf['gd_supported_format'], (isset($info['JPG Support']) and $info['JPG Support']) or (isset($info['JPEG Support']) and $info['JPEG Support']) ? 'jpeg' : NULL);
array_push($pwg_conf['gd_supported_format'], $info['PNG Support'] ? 'png' : NULL);
array_push($pwg_conf['gd_supported_format'], ($info['GIF Read Support'] and $info['GIF Create Support']) ? 'gif' : NULL);
@@ -1106,7 +1106,7 @@ function pwg_test_exit()
$format_list = array();
$format = ($info['GIF Create Support']) ? '<code>gif</code>' : NULL;
array_push($format_list, $format);
- $format = (isset($info['JPG Support']) or isset($info['JPEG Support'])) ? '<code>jpg</code>' : NULL;
+ $format = ((isset($info['JPG Support']) and $info['JPG Support']) or (isset($info['JPEG Support']) and $info['JPEG Support'])) ? '<code>jpg</code>' : NULL;
array_push($format_list, $format);
$format = ($info['PNG Support']) ? '<code>png</code>' : NULL;
array_push($format_list, $format);