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

Merge pull request #9045 from hregis/8.0_multicompany

Browse Source 
Fix: check if multicompany object exists
This commit is contained in:
Laurent Destailleur 2018-07-06 14:23:59 +02:00 committed by GitHub
commit 67a831ad5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/public/stripe/ipn.php
View File

@ -88,7 +88,7 @@ $user = new User($db);
$user->fetch(5); $user->fetch(5);
$user->getrights(); $user->getrights();
if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabled)) { if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabled) && is_object($mc)) {
$sql = "SELECT entity"; $sql = "SELECT entity";
$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token"; $sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
$sql.= " WHERE service = '".$db->escape($service)."' and tokenstring = '%".$db->escape($event->account)."%'"; $sql.= " WHERE service = '".$db->escape($service)."' and tokenstring = '%".$db->escape($event->account)."%'";
@ -102,10 +102,12 @@ if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabl
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$key=$obj->entity; $key=$obj->entity;
} }
else {$key=1; else {
$key=1;
} }
} }
else {$key=1; else {
$key=1;
} }
$ret=$mc->switchEntity($key); $ret=$mc->switchEntity($key);
if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");