Merge branch '0.9.x' into openidplugin

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index 50de83f6fb2574dc2627c2c3b87da9785110ba3a..e09fdc76b49d4f82b48de852c57de65a2cd9d4ca 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -247,11 +247,10 @@ class LoginAction extends Action
             return _('For security reasons, please re-enter your ' .
                      'user name and password ' .
                      'before changing your settings.');
-        } else {
+        } else if (common_config('openid', 'enabled')) {
             return _('Login with your username and password. ' .
                      'Don\'t have a username yet? ' .
-                     '[Register](%%action.register%%) a new account, or ' .
-                     'try [OpenID](%%action.openidlogin%%). ');
+                     '[Register](%%action.register%%) a new account.');
         }
     }