diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-09-11 15:40:24 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-09-11 15:40:24 -0400 |
| commit | 5a37d15cb33e8a3bdd223439db61c491f683a8d6 (patch) | |
| tree | eba50bdde2f99b200ac5fd57f1ceae8e3295abab | |
| parent | f3365697b70384de8f03e745ef404b66d62c84b0 (diff) | |
| download | brdo-5a37d15cb33e8a3bdd223439db61c491f683a8d6.tar.gz brdo-5a37d15cb33e8a3bdd223439db61c491f683a8d6.tar.bz2 | |
- Patch #160163 by c960657, Pancho, danillonunes: login with OpenID link has mis-encoding of #.
| -rw-r--r-- | modules/openid/openid.js | 4 | ||||
| -rw-r--r-- | modules/openid/openid.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/openid/openid.js b/modules/openid/openid.js index 1f2042746..fdc97fa06 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 bb6ad712b..2bf891ab6 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'), ); |