From 0121b62396ec4c6abb80814e68801353eca6a21d Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 16 Feb 2012 14:18:12 +0100
Subject: [PATCH 1/2] Bump to version 3.5.12

---
 lib/version.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/version.inc b/lib/version.inc
index 2ba195237f..17df6ecc7d 100644
--- a/lib/version.inc
+++ b/lib/version.inc
@@ -15,5 +15,5 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-define('GV_version', '3.5.11.0');
+define('GV_version', '3.5.12.0');
 define('GV_version_name', 'Baobab');

From 97c254e86becbd04f3449ce8f6300a33ca83b0f5 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 16 Feb 2012 15:48:18 +0100
Subject: [PATCH 2/2] Fix DL

---
 lib/classes/set/export.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/classes/set/export.class.php b/lib/classes/set/export.class.php
index 1f5578ee75..d733b3ab7d 100644
--- a/lib/classes/set/export.class.php
+++ b/lib/classes/set/export.class.php
@@ -951,8 +951,11 @@ class set_export extends set_abstract
 
     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(
           array(
@@ -1049,7 +1052,7 @@ class set_export extends set_abstract
     $user    = false;
     if ($anonymous)
     {
-      
+
     }
     else
     {