diff options
| author | Jaime Perez <jaime.perez@uninett.no> | 2014-07-08 15:02:11 +0200 |
|---|---|---|
| committer | Jaime Perez <jaime.perez@uninett.no> | 2014-07-08 15:02:11 +0200 |
| commit | b9e02004f2d14b4b11355db3cf94fbf770f4fd3a (patch) | |
| tree | 8ca8c0884c2dc79846ba272436157c71e47cd1b1 /lib/SimpleSAML/Auth/Source.php | |
| parent | b8724609ee1e6ff40b22afd269cb2bca7b4ec9f7 (diff) | |
| download | simplesamlphp-b9e02004f2d14b4b11355db3cf94fbf770f4fd3a.zip simplesamlphp-b9e02004f2d14b4b11355db3cf94fbf770f4fd3a.tar.gz simplesamlphp-b9e02004f2d14b4b11355db3cf94fbf770f4fd3a.tar.bz2 | |
Rename SimpleSAML_Session::getInstance() to SimpleSAML_Session::getSessionFromRequest(), and leave the former as deprecated.
Diffstat (limited to 'lib/SimpleSAML/Auth/Source.php')
| -rw-r--r-- | lib/SimpleSAML/Auth/Source.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php index 802035e..29effde 100644 --- a/lib/SimpleSAML/Auth/Source.php +++ b/lib/SimpleSAML/Auth/Source.php @@ -111,7 +111,7 @@ abstract class SimpleSAML_Auth_Source { assert('isset($state["ReturnCallback"])'); /* The default implementation just copies over the previous authentication data. */ - $session = SimpleSAML_Session::getInstance(); + $session = SimpleSAML_Session::getSessionFromRequest(); $data = $session->getAuthState($this->authId); foreach ($data as $k => $v) { $state[$k] = $v; @@ -294,7 +294,7 @@ abstract class SimpleSAML_Auth_Source { ); - $session = SimpleSAML_Session::getInstance(); + $session = SimpleSAML_Session::getSessionFromRequest(); $session->setData('SimpleSAML_Auth_Source.LogoutCallbacks', $id, $data, SimpleSAML_Session::DATA_TIMEOUT_LOGOUT); } @@ -315,7 +315,7 @@ abstract class SimpleSAML_Auth_Source { $id = strlen($this->authId) . ':' . $this->authId . $assoc; - $session = SimpleSAML_Session::getInstance(); + $session = SimpleSAML_Session::getSessionFromRequest(); $data = $session->getData('SimpleSAML_Auth_Source.LogoutCallbacks', $id); if ($data === NULL) { |