From 37c216cfe403d7b1c669d9e51cfbb20694f48d51 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Mar 2015 15:43:11 +0100
Subject: [PATCH 1/2] Fix limit for very slow os.

---
 htdocs/install/upgrade.php  | 2 +-
 htdocs/install/upgrade2.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 89e54ef4443..22c18c15fee 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -47,7 +47,7 @@ $ok = 0;
 // Ne fonctionne que si on est pas en safe_mode.
 $err=error_reporting();
 error_reporting(0);
-@set_time_limit(120);
+@set_time_limit(300);
 error_reporting($err);
 
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a7226c1621d..0c96c3c6d5c 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -55,7 +55,7 @@ $error = 0;
 // Ne fonctionne que si on est pas en safe_mode.
 $err=error_reporting();
 error_reporting(0);
-@set_time_limit(120);
+@set_time_limit(300);
 error_reporting($err);
 
 $setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto';

From 7ef11b2f38a09e1a920b55496065dc4e1f56ad96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Mar 2015 13:16:59 +0100
Subject: [PATCH 2/2] Fix selected attribute not set correctly

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6d83561e2a9..c909df601f8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4303,7 +4303,7 @@ class Form
         }
         else
        {
-       		$selected=($useempty?'':' selected="selected"');
+       		$selected=(($useempty && $value != '0' && $value != 'no')?'':' selected="selected"');
             $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
             $resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
         }