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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-24 19:56:29 +02:00
commit fc1a1c6afe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/accounting-files.php
View File

@ -23,7 +23,7 @@
* \brief Page to show portoflio and files of a thirdparty and download it * \brief Page to show portoflio and files of a thirdparty and download it
*/ */
if ($_GET['action'] == 'dl' || $_POST['action'] == 'dl') { // To not replace token when downloading file if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key_exists('action', $_POST) && $_POST['action'] == 'dl')) { // To not replace token when downloading file
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
} }

3
htdocs/core/tpl/advtarget.tpl.php
View File

@ -459,7 +459,8 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
// Standard Extrafield feature // Standard Extrafield feature
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
$elementype = Contact::$table_element; $contactstatic = new Contact($db);
$elementype = $contactstatic->table_element;
// fetch optionals attributes and labels // fetch optionals attributes and labels
dol_include_once('/core/class/extrafields.class.php'); dol_include_once('/core/class/extrafields.class.php');
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);