summaryrefslogtreecommitdiffstats
path: root/Auth
diff options
context:
space:
mode:
authorLilli <lilli@janrain.com>2010-02-12 12:21:57 -0800
committerLilli <lilli@janrain.com>2010-02-12 12:21:57 -0800
commit8f98800284b55606d1bcfbb1ad70717119834c2f (patch)
treef766ecad18a0cf7cd5435084e66115f667c569fe /Auth
parent7521906f3b7d76a850523baa7216a725f234ddf4 (diff)
downloadphp-openid-8f98800284b55606d1bcfbb1ad70717119834c2f.zip
php-openid-8f98800284b55606d1bcfbb1ad70717119834c2f.tar.gz
php-openid-8f98800284b55606d1bcfbb1ad70717119834c2f.tar.bz2
Added the following patch from the dev@openidenabled.com mailing list:
http://lists.openidenabled.com/pipermail/dev/attachments/20090113/8ed067b3/attachment.bin Original Message: will at willnorris.com will at willnorris.com Sun Jan 4 11:27:26 PST 2009 darcs patch: I'm not entirely sure which versions of PHP are having... "I've had a number of users report that $this->store is incorrectly evaluating to false, thereby preventing associations from being used. I've been unable to reproduce this myself, but the change is minor enough." This patch was in the form of a Darcs patch, not a normal patch. So solve this, I applied it to the Darcs repository found on openidenabled, then created a new diff file between the original Darcs repo and the new one (with the patch applied) so that I could apply it to this git repo. All hunks were applied successfully.
Diffstat (limited to 'Auth')
-rw-r--r--Auth/OpenID/Consumer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 50823db..987ba90 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -615,7 +615,7 @@ class Auth_OpenID_GenericConsumer {
{
$this->store =& $store;
$this->negotiator =& Auth_OpenID_getDefaultNegotiator();
- $this->_use_assocs = ($this->store ? true : false);
+ $this->_use_assocs = (is_null($this->store) ? false : true);
$this->fetcher = Auth_Yadis_Yadis::getHTTPFetcher();