feature #379, multiple format, hide formats when disabled

2 files changed, 15 insertions, 12 deletions

diff --git a/action.php b/action.php
index de326e8b6..6bdb3bf11 100644
--- a/action.php
+++ b/action.php
@@ -57,7 +57,7 @@ function do_error( $code, $str )
   exit();
 }
 
-if (isset($_GET['format']))
+if ($conf['enable_formats'] and isset($_GET['format']))
 {
   check_input_parameter('format', $_GET, false, PATTERN_ID);
 
diff --git a/picture.php b/picture.php
index a6c6defb7..f2dfecf0e 100644
--- a/picture.php
+++ b/picture.php
@@ -663,25 +663,28 @@ if ($conf['picture_download_icon'] and !empty($picture['current']['download_url'
 {
   $template->append('current', array('U_DOWNLOAD' => $picture['current']['download_url']), true);
 
-  $query = '
+  if ($conf['enable_formats'])
+  {
+    $query = '
 SELECT *
   FROM '.IMAGE_FORMAT_TABLE.'
   WHERE image_id = '.$picture['current']['id'].'
 ;';
-  $formats = query2array($query);
+    $formats = query2array($query);
   
-  if (!empty($formats))
-  {
-    foreach ($formats as &$format)
+    if (!empty($formats))
     {
-      $format['download_url'] = 'action.php?format='.$format['format_id'];
-      $format['download_url'].= '&download='.substr(md5(time()), 0, 6); // a random string to avoid browser cache
-      
-      $format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024);
+      foreach ($formats as &$format)
+      {
+        $format['download_url'] = 'action.php?format='.$format['format_id'];
+        $format['download_url'].= '&download='.substr(md5(time()), 0, 6); // a random string to avoid browser cache
+        
+        $format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024);
+      }
     }
-  }
 
-  $template->append('current', array('formats' => $formats), true);
+    $template->append('current', array('formats' => $formats), true);
+  }
 }