hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-02-16 15:57:36 +01:00
parent 2a2406b9e3 97c254e86b
commit 1e7e16de7b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/set/export.class.php
View File

@@ -977,8 +977,11 @@ class set_export extends set_abstract
if (is_file($file)) if (is_file($file))
{ {
$testPath = strpos($file, $registry->get('GV_RootPath').'tmp/download/') !== false
|| strpos($file, $registry->get('GV_RootPath').'tmp/lazaret/') !== false
|| strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false;
if ($registry->get('GV_modxsendfile') && strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false) if ($registry->get('GV_modxsendfile') && $testPath)
{ {
$file_xaccel = str_replace( $file_xaccel = str_replace(
array( array(