lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

custom dir seems stable enough to be on by default.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-05 00:09:08 +01:00
parent 109eefaf03
commit 66a95be78a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/install/step1.php
View File

@ -431,10 +431,10 @@ if (! $error && $db->connected && $action == "set")
$main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_'); $main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
// Force https // Force https
$main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0'); $main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == '1')) ? '1' : '0');
// Use alternative directory // Use alternative directory
$main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1)) ? '' : '//'); $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "off" || GETPOST("main_use_alt_dir") == '0')) ? '//' : '');
// Alternative root directory name // Alternative root directory name
$main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom'); $main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
@ -455,8 +455,8 @@ if (! $error && $db->connected && $action == "set")
} }
// Write main.inc.php and master.inc.php into documents/custom dir // Write main.inc.php and master.inc.php into documents/custom dir
$error+=write_main_file($main_data_dir.'/custom/main.inc.php',$main_dir); //$error+=write_main_file($main_data_dir.'/custom/main.inc.php',$main_dir);
$error+=write_master_file($main_data_dir.'/custom/master.inc.php',$main_dir); //$error+=write_master_file($main_data_dir.'/custom/master.inc.php',$main_dir);
// Create database and admin user database // Create database and admin user database
if (! $error) if (! $error)