aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-02-19 09:46:42 +0000
committerplegall <plg@piwigo.org>2010-02-19 09:46:42 +0000
commit0c4bdbe01325869a62380c1d2804c34e8a31c1dd (patch)
tree4d954192e0a868d9bb75043466c4d8838aa40090
parent6ba826eb321ebeabb628f426ffc6c48525e1fb25 (diff)
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
-rw-r--r--action.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/action.php b/action.php
index 746ae1733..5c9322a7f 100644
--- a/action.php
+++ b/action.php
@@ -177,8 +177,7 @@ $http_headers[] = 'Content-Type: '.$ctype;
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