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

Merge pull request #8007 from atm-florian/develop

Browse Source 
fix #8004
This commit is contained in:
Laurent Destailleur 2018-01-04 20:56:38 +01:00 committed by GitHub
commit cc24634cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -795,6 +795,7 @@ class BlockedLog
if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$fingerprint = dol_hash(print_r($mysoc,true).getRandomPassword(1), '5'); $fingerprint = dol_hash(print_r($mysoc,true).getRandomPassword(1), '5');

2
htdocs/install/mysql/tables/llx_inventory.key.sql
View File

@ -20,4 +20,4 @@
ALTER TABLE llx_inventory ADD UNIQUE INDEX uk_inventory_ref (ref, entity); ALTER TABLE llx_inventory ADD UNIQUE INDEX uk_inventory_ref (ref, entity);
ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms); ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec); ALTER TABLE llx_inventory ADD INDEX idx_inventory_date_creation (date_creation);