Fixing style errors.
This commit is contained in:
parent
858a65a173
commit
eac95a1a29
@ -454,7 +454,7 @@ if (!file_exists($conffile)) {
|
|||||||
|
|
||||||
if ($ok) {
|
if ($ok) {
|
||||||
if (count($dolibarrlastupgradeversionarray) >= 2) { // If database access is available and last upgrade version is known
|
if (count($dolibarrlastupgradeversionarray) >= 2) { // If database access is available and last upgrade version is known
|
||||||
// Now we check if this is the first qualified choice
|
// Now we check if this is the first qualified choice
|
||||||
if ($allowupgrade && empty($foundrecommandedchoice) &&
|
if ($allowupgrade && empty($foundrecommandedchoice) &&
|
||||||
(versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
|
(versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
|
||||||
) {
|
) {
|
||||||
|
|||||||
@ -311,7 +311,7 @@ if (!$error && $db->connected) {
|
|||||||
// Define $defaultCharacterSet and $defaultDBSortingCollation
|
// Define $defaultCharacterSet and $defaultDBSortingCollation
|
||||||
if (!$error && $db->connected) {
|
if (!$error && $db->connected) {
|
||||||
if (!empty($db_create_database)) { // If we create database, we force default value
|
if (!empty($db_create_database)) { // If we create database, we force default value
|
||||||
// Default values come from the database handler
|
// Default values come from the database handler
|
||||||
|
|
||||||
$defaultCharacterSet = $db->forcecharset;
|
$defaultCharacterSet = $db->forcecharset;
|
||||||
$defaultDBSortingCollation = $db->forcecollate;
|
$defaultDBSortingCollation = $db->forcecollate;
|
||||||
|
|||||||
@ -358,7 +358,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
|
|||||||
if (is_resource($handlemodule)) {
|
if (is_resource($handlemodule)) {
|
||||||
while (($filemodule = readdir($handlemodule)) !== false) {
|
while (($filemodule = readdir($handlemodule)) !== false) {
|
||||||
if (!preg_match('/\./', $filemodule) && is_dir($dirroot.'/'.$filemodule.'/sql')) { // We exclude filemodule that contains . (are not directories) and are not directories.
|
if (!preg_match('/\./', $filemodule) && is_dir($dirroot.'/'.$filemodule.'/sql')) { // We exclude filemodule that contains . (are not directories) and are not directories.
|
||||||
//print "Scan for ".$dirroot . '/' . $filemodule . '/sql/'.$file;
|
//print "Scan for ".$dirroot . '/' . $filemodule . '/sql/'.$file;
|
||||||
if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file)) {
|
if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file)) {
|
||||||
$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
|
$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user