consolidate linking a user to an OpenID

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

diff --git a/actions/login.php b/actions/login.php
index c152c87707bf504df3806e242cbd841010bd30fb..5544fd8786a4ea79ccb6553075391234731228e5 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -61,8 +61,12 @@ class LoginAction extends Action {
 
        function show_form($error=NULL) {
                common_show_header(_t('Login'));
-               if (!is_null($error)) {
-                       common_element('div', array('class' => 'error'), $msg);
+               if ($error) {
+                       common_element('div', array('class' => 'error'), $error);
+               } else {
+                       common_element('div', 'instructions', 
+                                                  _t('Login with your username and password. ' .
+                                                         'Don\'t have a username yet? Choose register above. '));
                }
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',