summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.php3
-rw-r--r--plugins/OpenID/OpenIDPlugin.php13
2 files changed, 14 insertions, 2 deletions
diff --git a/index.php b/index.php
index 372a8536e..c1245136e 100644
--- a/index.php
+++ b/index.php
@@ -107,8 +107,7 @@ function checkMirror($action_obj)
function isLoginAction($action)
{
- static $loginActions = array('login', 'openidlogin', 'finishopenidlogin',
- 'recoverpassword', 'api', 'doc', 'register');
+ static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register');
$login = null;
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 199b1b351..fb6bc5cf8 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -129,4 +129,17 @@ class OpenIDPlugin extends Plugin
return true;
}
}
+
+ function onLoginAction($action, &$login)
+ {
+ switch ($action)
+ {
+ case 'openidlogin':
+ case 'finishopenidlogin':
+ $login = true;
+ return false;
+ default:
+ return true;
+ }
+ }
}