merge r4912 from branch 2.0 to trunk

feature 967: when clicking on the download link (only for high definition currently), use images.file instead of basename(images.path) as download file name. git-svn-id: http://piwigo.org/svn/trunk@4913 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 19, 2010 · 0c4bdbe · 0c4bdbe
1 parent 6ba826e
commit 0c4bdbe
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/action.php b/action.php
@@ -177,8 +177,7 @@ function do_error( $code, $str )
 
 if (!isset($_GET['view']))
 {
-  $http_headers[] = 'Content-Disposition: attachment; filename="'
-            .basename($file).'";';
+  $http_headers[] = 'Content-Disposition: attachment; filename="'.$element_info['file'].'";';
   $http_headers[] = 'Content-Transfer-Encoding: binary';
 }
 else