diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-02-05 20:02:47 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-02-05 20:02:47 +0000 |
| commit | 986abdd968ea6a72df0329038288e31c76403b0b (patch) | |
| tree | 68e7008334be6b85ad9813c26838994ccb2296ea /lib/settingsaction.php | |
| parent | 96ca4ef75ae47228031ab4ba17b3340735342363 (diff) | |
| parent | 9febe8ce394d8428355ac73f1c0f6a9555252bd2 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib/settingsaction.php')
| -rw-r--r-- | lib/settingsaction.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/settingsaction.php b/lib/settingsaction.php index dfe1f114b..53c807c6f 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -76,7 +76,12 @@ class SettingsAction extends Action // change important settings or see private info, and // _all_ our settings are important common_set_returnto($this->selfUrl()); - common_redirect(common_local_url('login')); + $user = common_current_user(); + if ($user->hasOpenID()) { + common_redirect(common_local_url('openidlogin')); + } else { + common_redirect(common_local_url('login')); + } } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); } else { |