summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2011-09-11 19:40:17 (GMT)
committerDries Buytaert2011-09-11 19:40:17 (GMT)
commit5b98347d00bdd0895e630a4e5ea347b197aacb78 (patch)
treef7c3b7c5dfde2335ef0af3e3113ed89b4bba53a5
parenteeac53e45f99b51f4826703dab59c35fa4d7aab6 (diff)
- Patch #160163 by c960657, Pancho, danillonunes: login with OpenID link has mis-encoding of #.
-rw-r--r--modules/openid/openid.js4
-rw-r--r--modules/openid/openid.module4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/openid/openid.js b/modules/openid/openid.js
index 1f20427..fdc97fa 100644
--- a/modules/openid/openid.js
+++ b/modules/openid/openid.js
@@ -11,10 +11,10 @@ Drupal.behaviors.openid = {
if (cookie) {
$('#edit-openid-identifier').val(cookie);
}
- if ($('#edit-openid-identifier').val()) {
+ if ($('#edit-openid-identifier').val() || location.hash == '#openid-login') {
$('#edit-openid-identifier').addClass('openid-processed');
loginElements.hide();
- // Use .css('display', 'block') instead of .show() to Konqueror friendly.
+ // Use .css('display', 'block') instead of .show() to be Konqueror friendly.
openidElements.css('display', 'block');
}
}
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index bb6ad71..2bf891a 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -146,11 +146,11 @@ function _openid_user_login_form_alter(&$form, &$form_state) {
$items = array();
$items[] = array(
- 'data' => l(t('Log in using OpenID'), '#'),
+ 'data' => l(t('Log in using OpenID'), '#openid-login', array('external' => TRUE)),
'class' => array('openid-link'),
);
$items[] = array(
- 'data' => l(t('Cancel OpenID login'), '#'),
+ 'data' => l(t('Cancel OpenID login'), '#', array('external' => TRUE)),
'class' => array('user-link'),
);