Resolved Issue ID 0000544:

  o Error on download HD picture 

Merge branch-1_6 1550:1551 into BSF


git-svn-id: http://piwigo.org/svn/trunk@1552 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 7 insertions, 1 deletions

diff --git a/action.php b/action.php
index c20b07d3a..c343b4c25 100644
--- a/action.php
+++ b/action.php
@@ -58,7 +58,13 @@ function force_download ($filename)
          .basename($filename)."\";");
   header("Content-Transfer-Encoding: binary");
   header("Content-Length: ".@filesize($filename));
-  set_time_limit(0);
+
+  // Looking at the safe_mode configuration for execution time
+  if (ini_get('safe_mode') == 0)
+  {
+    @set_time_limit(0);
+  }
+
   @readfile("$filename") or die("File not found.");
 }