summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-09 08:48:50 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-09 08:48:50 +0000
commitd37485699eafebe37d800aeaf724b0767a6a2dfb (patch)
treecadeaaca3b7b0e25a036cafd42068d4eeb53e240 /modules
parente24028e9d1f85a585005da60945f745afdb72ad8 (diff)
downloadbrdo-d37485699eafebe37d800aeaf724b0767a6a2dfb.tar.gz
brdo-d37485699eafebe37d800aeaf724b0767a6a2dfb.tar.bz2
#54294, don't show DA stuff, if disabled. Patch by Moshe
Diffstat (limited to 'modules')
-rw-r--r--modules/user.module2
-rw-r--r--modules/user/user.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module
index 26e087f19..d9c5caa53 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -883,7 +883,7 @@ function user_login($msg = '') {
'#required' => TRUE,
'#attributes' => array('tabindex' => '1'),
);
- if (count(user_auth_help_links()) > 0) {
+ if (variable_get('drupal_authentication_service', FALSE) && count(user_auth_help_links()) > 0) {
$form['name']['#description'] = t('Enter your %s username, or an ID from one of our affiliates: %a.', array('%s' => variable_get('site_name', 'local'), '%a' => implode(', ', user_auth_help_links())));
}
else {
diff --git a/modules/user/user.module b/modules/user/user.module
index 26e087f19..d9c5caa53 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -883,7 +883,7 @@ function user_login($msg = '') {
'#required' => TRUE,
'#attributes' => array('tabindex' => '1'),
);
- if (count(user_auth_help_links()) > 0) {
+ if (variable_get('drupal_authentication_service', FALSE) && count(user_auth_help_links()) > 0) {
$form['name']['#description'] = t('Enter your %s username, or an ID from one of our affiliates: %a.', array('%s' => variable_get('site_name', 'local'), '%a' => implode(', ', user_auth_help_links())));
}
else {