composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source
This commit is contained in:
Pierre Goiffon
2023-07-06 15:48:42 +02:00
parent 8907525b78 264a8cd70a
commit a010239efb
8 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/Core/Authentication/Client/OAuth/OAuthClientProviderFactory.php
View File

@@ -74,6 +74,7 @@ class OAuthClientProviderFactory
* @return AccessTokenInterface
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \League\OAuth2\Client\Provider\Exception\IdentityProviderException
*/
public static function GetAccessTokenFromCode(OAuthClient $oOAuthClient, $sCode)
{
@@ -109,7 +110,7 @@ class OAuthClientProviderFactory
/**
* @param \DBObject $oOAuthClient
*
* @return mixed
* @return OAuthClientProviderAbstract
* @throws \ArchivedObjectException
* @throws \CoreException
*/

6
sources/Core/Email/EmailSwiftMailer.php
View File

@@ -181,7 +181,11 @@ class EmailSwiftMailer extends EMail
case 'PHPMail':
default:
$oTransport = new Swift_SendmailTransport();
// Retrieve sendmail path or select a default one as SwiftMailer is not doing it anymore
$sSendmailPath = ini_get('sendmail_path');
$sSendmailPath = ($sSendmailPath === false || $sSendmailPath === '') ? '/usr/sbin/sendmail -bs' : $sSendmailPath;
$oTransport = new Swift_SendmailTransport($sSendmailPath);
}
$oMailer = new Swift_Mailer($oTransport);