wait #3984 @1

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 23c66f4c6c5e386655f04d9ffc43802cbb097dea..4d8f0105abaaf8f04ba6df48bad02cb959140467 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -1650,6 +1650,7 @@ class commonTools
     {
 
         commonDroits::min(1);
+        set_time_limit(0);
         if (!count($_FILES) || !isset($_FILES['file']) || $_FILES['file']['error'] > 0) {
             return self::ipGlobal(__('Erreur lors du chargement du fichier'));
         }
@@ -1660,7 +1661,7 @@ class commonTools
         // Update git repository
         $repos = ROOT . '/../ipglobal-library/';
 
-        `cd $repos;git reset --hard;git pull`;
+        `cd $repos;git reset --hard;timeout 30 git pull`;
 
         // Handle zip upload
         $uploaded = new ZipArchive();