From dde1ac0bd3628c8a064b93a5b07abf17089fd386 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 13 Mar 2012 09:39:39 +0000
Subject: [PATCH] consent: Remove backwards-compatibility code.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3040 44740490-163a-0410-bde0-09ae8108e29a
---
modules/consent/lib/Auth/Process/Consent.php | 5 -----
1 file changed, 5 deletions(-)
diff --git a/modules/consent/lib/Auth/Process/Consent.php b/modules/consent/lib/Auth/Process/Consent.php
index a7c06e568..a20b75c0d 100644
--- a/modules/consent/lib/Auth/Process/Consent.php
+++ b/modules/consent/lib/Auth/Process/Consent.php
@@ -149,7 +149,6 @@ class sspmod_consent_Auth_Process_Consent extends SimpleSAML_Auth_ProcessingFilt
assert('array_key_exists("entityid", $state["Source"])');
assert('array_key_exists("metadata-set", $state["Source"])');
- $session = SimpleSAML_Session::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
/**
@@ -161,10 +160,6 @@ class sspmod_consent_Auth_Process_Consent extends SimpleSAML_Auth_ProcessingFilt
if (isset($state['saml:sp:IdP'])) {
$idpmeta = $metadata->getMetaData($state['saml:sp:IdP'], 'saml20-idp-remote');
$state['Source'] = $idpmeta;
- } elseif ($session->getIdP() !== null) {
- // For backwards compatibility. TODO: Remove in version 1.8
- $idpmeta = $metadata->getMetaData($session->getIdP(), 'saml20-idp-remote');
- $state['Source'] = $idpmeta;
}
if ($this->_store !== null) {
--
GitLab