Skip to content
Snippets Groups Projects
Commit 9b1e9b4a authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Update php version to 5.2 because we use json_encode into ajax that requires 5.2.

parent da06d8bf
No related branches found
No related tags found
No related merge requests found
......@@ -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 '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("WarningPHPVersionTooLow",'5.0.0');
print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("WarningPHPVersionTooLow",'5.2.0');
$checksok=0;
}
else
......
......@@ -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++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment