From f1e18513e1c8a3ba2c4490eaa19b7c2cf035bc2d Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 16 Nov 2010 14:29:42 +0000
Subject: [PATCH] Session: Remove NameID conversion code.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2632 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Session.php | 13 -------------
www/wsfed/sp/prp.php | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index c329415aa..912d52be3 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -324,19 +324,6 @@ class SimpleSAML_Session {
$this->nameid = $nameid;
}
public function getNameID() {
- if (array_key_exists('value', $this->nameid)) {
- /*
- * This session was saved by an old version of simpleSAMLphp.
- * Convert to the new NameId format.
- *
- * TODO: Remove this conversion once every session uses the new format.
- */
- $this->nameid['Value'] = $this->nameid['value'];
- unset($this->nameid['value']);
-
- $this->dirty = TRUE;
- }
-
return $this->nameid;
}
diff --git a/www/wsfed/sp/prp.php b/www/wsfed/sp/prp.php
index 8efd76edb..3100fd290 100644
--- a/www/wsfed/sp/prp.php
+++ b/www/wsfed/sp/prp.php
@@ -116,7 +116,7 @@ try {
}
$nameid = array(
'Format' => $nameid->item(0)->getAttribute('Format'),
- 'value' => $nameid->item(0)->textContent,
+ 'Value' => $nameid->item(0)->textContent,
);
--
GitLab