diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 15:42:11 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 15:42:11 -0400 |
| commit | b2664e1ae2e2cf66585cdd8696d88efdd053eb3b (patch) | |
| tree | 3e406bc5502c0937f2cf81e0b4a6a1b714a1b403 /actions/invite.php | |
| parent | c78772b2748f70acc8158b665218fe53b277a031 (diff) | |
| parent | 9f07921b45190b462e1a798622068e24ef31e124 (diff) | |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
Diffstat (limited to 'actions/invite.php')
| -rw-r--r-- | actions/invite.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/invite.php b/actions/invite.php index 26c951ed2..bdc0d34cb 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -235,7 +235,7 @@ class InviteAction extends CurrentUserDesignAction common_root_url(), $personal, common_local_url('showstream', array('nickname' => $user->nickname)), - common_local_url('register', array('code' => $invite->code))); + common_local_url((!common_config('site', 'openidonly')) ? 'register' : 'openidlogin', array('code' => $invite->code))); mail_send($recipients, $headers, $body); } |