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

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2012-02-17 12:40:10 +01:00
parent 7c074b75ec abbcf8075e
commit 9dd8dd0c22
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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