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

Merge pull request #7317 from hregis/6.0_bug2

Browse Source 
Fix: missing $dolibarrdataroot value
This commit is contained in:
Laurent Destailleur 2017-09-02 00:05:42 +02:00 committed by GitHub
commit 5ba13a9500
1 changed files with 90 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/modules.php
View File

@ -845,7 +845,7 @@ if ($mode == 'deploy')
{ {
dol_fiche_head($head, $mode, '', -1); dol_fiche_head($head, $mode, '', -1);
$dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT);
$allowonlineinstall=true; $allowonlineinstall=true;
$allowfromweb=1; $allowfromweb=1;
if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false; if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
@ -872,7 +872,6 @@ if ($mode == 'deploy')
} }
else else
{ {
$message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample")); $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
$allowfromweb=0; $allowfromweb=0;
} }
@ -936,7 +935,6 @@ if ($mode == 'deploy')
} }
} }
if (! empty($result['return'])) if (! empty($result['return']))
{ {
print '<br>'; print '<br>';
@ -950,8 +948,6 @@ if ($mode == 'deploy')
dol_fiche_end(); dol_fiche_end();
} }
llxFooter(); llxFooter();
$db->close(); $db->close();