Skip to content

Commit c934c90

Browse files
snufkinBalazs Dianiska
authored andcommitted
Issue #2478473 by snufkin: Class 'SimpleSAML_Configuration' is not loaded properly in simplesamlphp_auth.install
1 parent 965ccc7 commit c934c90

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

simplesamlphp_auth.install

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ function simplesamlphp_auth_requirements($phase) {
7474
'description' => $t('Please download and install the !simplesamlphp library.', array('!simplesamlphp' => l($t('SimpleSAMLphp'), 'https://simplesamlphp.org/download'))),
7575
);
7676
}
77-
// SimpleSAMLphp is installed. Check the version.
78-
else {
79-
$_simplesamlphp_auth_saml_config = SimpleSAML_Configuration::getInstance();
80-
$_simplesamlphp_auth_saml_version = $_simplesamlphp_auth_saml_config->getVersion();
77+
// SimpleSAMLphp is installed, lets autoload it
78+
else if (_simplesaml_auth_autoload()) {
79+
// If autoloading was successful we should have these variables.
80+
global $_simplesamlphp_auth_saml_config;
81+
global $_simplesamlphp_auth_saml_version;
82+
8183
if (!empty($_simplesamlphp_auth_saml_version)) {
8284
$ver = explode('.', $_simplesamlphp_auth_saml_version);
8385
$requirements['simplesamlphp_auth_version'] = array(

0 commit comments

Comments
 (0)