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

Merge pull request #9884 from hregis/develop_bug

Browse Source 
FIX $forceentity is not used, replace by $currentobject if needed
This commit is contained in:
Laurent Destailleur 2018-10-30 14:16:29 +01:00 committed by GitHub
commit 81c70898bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@ -115,16 +115,16 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
* 'c_paiement', 'c_payment_term', ...
* @param int $shared 0=Return id of current entity only,
* 1=Return id of current entity + shared entities (default)
* @param int $forceentity Entity id
* @param object $currentobject Current object if needed
* @return mixed Entity id(s) to use
*/
function getEntity($element, $shared=1, $forceentity=null)
function getEntity($element, $shared=1, $currentobject=null)
{
global $conf, $mc;
if (is_object($mc))
{
return $mc->getEntity($element, $shared, $forceentity);
return $mc->getEntity($element, $shared, $currentobject);
}
else
{