Merged revisions 1917-2036 from trunk.

tbrehm

2010-09-26 89e4554cb0bbf4b515f1e9f4ec6d48d0a95706c5

 interface/web/login/index.php

@@ -176,11 +176,15 @@
                     //* Incorrect login - Username and password incorrect
                      $error = $app->lng('error_user_password_incorrect');
                      if($app->db->errorMessage != '') $error .= '<br />'.$app->db->errorMessage != '';
						
                  $app->plugin->raiseEvent('login_failed',$this);	
                    }
              }
            } else {
                //* Username or password empty
               if($error == '') $error = $app->lng('error_user_password_empty');
				
            $app->plugin->raiseEvent('login_empty',$this);
           }
      }
      if($error != ''){