summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-04 13:10:43 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-04 13:10:43 -0400
commit000e21be1917b190a2aaca2e864bbf79de4796bb (patch)
tree3d53572ac552f575d340d6730f5c40e3702f17a4 /lib
parent2ed46ce274c3b404fdf75aacafa5d5fa7a807240 (diff)
parent8f122dd71efcc54b820629bc4c39efe91b8e8726 (diff)
Merge branch '0.9.x' into openidplugin
Diffstat (limited to 'lib')
-rw-r--r--lib/settingsaction.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 17d3a2f64..4cf9b80c4 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -77,10 +77,12 @@ class SettingsAction extends CurrentUserDesignAction
// _all_ our settings are important
common_set_returnto($this->selfUrl());
$user = common_current_user();
- if ($user->hasOpenID()) {
- common_redirect(common_local_url('openidlogin'), 303);
- } else {
- common_redirect(common_local_url('login'), 303);
+ if (Event::handle('RedirectToLogin', array($this, $user))) {
+ if ($user->hasOpenID()) {
+ common_redirect(common_local_url('openidlogin'), 303);
+ } else {
+ common_redirect(common_local_url('login'), 303);
+ }
}
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();