diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
commit | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (patch) | |
tree | 76666150701f03205bfff77e7d034dfa724f8764 /lib/openid.php | |
parent | 399669b1fb955d2d8c18098a7b551184d534a94c (diff) | |
parent | e185c0395a6cd250ccd7c8e385c54830be73f937 (diff) |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
lib/action.php
lib/router.php
lib/twitter.php
Diffstat (limited to 'lib/openid.php')
-rw-r--r-- | lib/openid.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/openid.php b/lib/openid.php index 5c3d460da..3aa488b6d 100644 --- a/lib/openid.php +++ b/lib/openid.php @@ -160,7 +160,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $auth_request->addExtension($sreg_request); } - $trust_root = common_local_url('public'); + $trust_root = common_path(''); $process_url = common_local_url($returnto); if ($auth_request->shouldSendRedirect()) { |