Revision: 3080
Author: j...@wayf.dk
Date: Wed Apr 25 00:16:31 2012
Log: Merge r3079 to 1.9 branch
http://code.google.com/p/simplesamlphp/source/detail?r=3080
Modified:
/branches/simplesamlphp-1.9/modules/consent/www/getconsent.php
=======================================
--- /branches/simplesamlphp-1.9/modules/consent/www/getconsent.php Wed Mar
21 05:28:53 2012
+++ /branches/simplesamlphp-1.9/modules/consent/www/getconsent.php Wed Apr
25 00:16:31 2012
@@ -32,7 +32,15 @@
$id = $_REQUEST['StateId'];
$state = SimpleSAML_Auth_State::loadState($id, 'consent:request');
-$spentityid = $state['core:SP'];
+
+if (array_key_exists('core:SP', $state)) {
+ $spentityid = $state['core:SP'];
+} else if (array_key_exists('saml:sp:State', $state)) {
+ $spentityid = $state['saml:sp:State']['core:SP'];
+} else {
+ $spentityid = 'UNKNOWN';
+}
+
// The user has pressed the yes-button
if (array_key_exists('yes', $_REQUEST)) {
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to simplesamlphp-commits@googlegroups.com.
To unsubscribe from this group, send email to
simplesamlphp-commits+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
