summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/util.php3
-rw-r--r--plugins/OpenID/OpenIDPlugin.php15
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php
index cd9bd9ed8..1f9dd429c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -735,8 +735,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
function common_is_sensitive($action)
{
static $sensitive = array('login', 'register', 'passwordsettings',
- 'twittersettings', 'finishopenidlogin',
- 'finishaddopenid', 'api');
+ 'twittersettings', 'api');
$ssl = null;
if (Event::handle('SensitiveAction', array($action, &$ssl))) {
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 5d600159b..ccbad5ffb 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -119,4 +119,17 @@ class OpenIDPlugin extends Plugin
return true;
}
}
-} \ No newline at end of file
+
+ function onSensitiveAction($action, &$ssl)
+ {
+ switch ($action)
+ {
+ case 'finishopenidlogin':
+ case 'finishaddopenid':
+ $ssl = true;
+ return false;
+ default:
+ return true;
+ }
+ }
+}