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

Dolibarr · Jul 6, 2018 · 997ae76 · 997ae76
2 parents ed6ec81 + 67a831a
commit 997ae76
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
@@ -88,7 +88,7 @@
 $user->fetch(5);
 $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.= " FROM ".MAIN_DB_PREFIX."oauth_token";
 	$sql.= " WHERE service = '".$db->escape($service)."' and tokenstring = '%".$db->escape($event->account)."%'";
@@ -102,10 +102,12 @@
 			$obj = $db->fetch_object($result);
 			$key=$obj->entity;
 		}
-		else {$key=1;
+		else {
+			$key=1;
 		}
 	}
-	else {$key=1;
+	else {
+		$key=1;
 	}
 	$ret=$mc->switchEntity($key);
 	if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");