mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
50c92d4730
|
@ -134,7 +134,7 @@ class Saml
|
||||||
$this->_auth = new OneLogin_Saml2_Auth($this->_settings);
|
$this->_auth = new OneLogin_Saml2_Auth($this->_settings);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
if ( $this->isEnabled() ) { // $this->loadSettings() initializes this to true if SAML is enabled by settings.
|
if ( $this->isEnabled() ) { // $this->loadSettings() initializes this to true if SAML is enabled by settings.
|
||||||
\Log::error('Trying OneLogin_Saml2_Auth failed. Setting SAML enabled to false. OneLogin_Saml2_Auth error message is: '. $e->getMessage());
|
\Log::warning('Trying OneLogin_Saml2_Auth failed. Setting SAML enabled to false. OneLogin_Saml2_Auth error message is: '. $e->getMessage());
|
||||||
}
|
}
|
||||||
$this->_enabled = false;
|
$this->_enabled = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue