Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-31 06:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18825 from grandoc/new_branch_25_09_2021

Browse Source 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
This commit is contained in:
Laurent Destailleur
2021-09-28 12:56:43 +02:00
committed by GitHub
parent bde8ba300a 8f4fb9fd3c
commit 43637c936c
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_members_by_type.php
View File

@@ -68,7 +68,7 @@ class box_members_by_type extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
$this->hidden = !($user->rights->adherent->lire);
$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**

2
htdocs/core/boxes/box_members_last_modified.php
View File

@@ -67,7 +67,7 @@ class box_members_last_modified extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
$this->hidden = !($user->rights->adherent->lire);
$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**

2
htdocs/core/boxes/box_members_last_subscriptions.php
View File

@@ -67,7 +67,7 @@ class box_members_last_subscriptions extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
$this->hidden = !($user->rights->adherent->lire);
$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**

2
htdocs/core/boxes/box_members_subscriptions_by_year.php
View File

@@ -67,7 +67,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
$this->enabled = 0; // disabled for external users
}
$this->hidden = !($user->rights->adherent->lire);
$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
}
/**

5
htdocs/core/lib/barcode.lib.php
View File

@@ -59,7 +59,10 @@ if (empty($font_loc)) {
if (defined('PHP-BARCODE_PATH_COMMAND')) {
$genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
} else {
$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
$genbarcode_loc = '';
if (!empty($conf->global->GENBARCODE_LOCATION)) {
$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
}
}