From 9b1e9b4ad44e8181f8242291fb4c55cf1712d73b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Aug 2011 12:14:25 +0000 Subject: [PATCH] Fix: Update php version to 5.2 because we use json_encode into ajax that requires 5.2. --- htdocs/install/check.php | 4 ++-- htdocs/install/etape1.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index e6430ff0f11..b550f71505e 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -22,7 +22,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.88 2011/08/11 20:59:32 eldy Exp $ + * \version $Id: check.php,v 1.89 2011/08/15 12:14:25 eldy Exp $ */ include_once("./inc.php"); @@ -73,7 +73,7 @@ if (versioncompare(versionphparray(),array(4,3,10)) < 0) // Minimum to us } else if (versioncompare(versionphparray(),array(5,2,0)) < 0) // Minimum supported (warning if lower) { - print 'Error '.$langs->trans("WarningPHPVersionTooLow",'5.0.0'); + print 'Error '.$langs->trans("WarningPHPVersionTooLow",'5.2.0'); $checksok=0; } else diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 313c33d2413..9bf4cf8c003 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -23,7 +23,7 @@ * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.139 2011/08/14 21:25:26 eldy Exp $ + * \version $Id: etape1.php,v 1.140 2011/08/15 12:14:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -162,13 +162,13 @@ if ($action == "set") } // Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification - $dir[0] = "$main_data_dir/facture"; - $dir[1] = "$main_data_dir/users"; - $dir[2] = "$main_data_dir/propale"; - $dir[3] = "$main_data_dir/mycompany"; - $dir[4] = "$main_data_dir/ficheinter"; - $dir[5] = "$main_data_dir/produit"; - $dir[6] = "$main_data_dir/rapport"; + $dir[0] = $main_data_dir."/mycompany"; + $dir[1] = $main_data_dir."/users"; + $dir[2] = $main_data_dir."/modules"; + $dir[3] = $main_data_dir."/facture"; + $dir[4] = $main_data_dir."/propale"; + $dir[5] = $main_data_dir."/ficheinter"; + $dir[6] = $main_data_dir."/produit"; // Boucle sur chaque repertoire de dir[] pour les creer s'ils nexistent pas for ($i = 0 ; $i < sizeof($dir) ; $i++)