Merge branch '0.9.x' into openidplugin

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();