X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=5544fd8786a4ea79ccb6553075391234731228e5;hb=d0559fdf4dafcaf8446b437f4af089c944a23d09;hp=c152c87707bf504df3806e242cbd841010bd30fb;hpb=1cdb7919ef055c519eacc9cd23ecbb34a7f6e137;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index c152c87707..5544fd8786 100644
--- 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',