From 378d0b07812d058f1bc263b686722011f134ddd4 Mon Sep 17 00:00:00 2001
From: wdammak <26695620+wdammak@users.noreply.github.com>
Date: Sat, 2 Nov 2019 13:18:48 +0100
Subject: [PATCH] Update upgrade2.php

---
 htdocs/install/upgrade2.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 428ed169022..ece176a4c11 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -64,7 +64,10 @@ $error = 0;
 // Ne fonctionne que si on est pas en safe_mode.
 $err=error_reporting();
 error_reporting(0);
-//@set_time_limit(300);
+if (! empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT))
+	@set_time_limit((int)$conf->global->MAIN_OVERRIDE_TIME_LIMIT);
+else
+	@set_time_limit(300);
 error_reporting($err);
 
 $setuplang=GETPOST("selectlang", 'aZ09', 3)?GETPOST("selectlang", 'aZ09', 3):'auto';