From beb57b01d58b5fcc4e422662220e16efbf677515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Mon, 7 Nov 2016 21:54:50 +0100
Subject: [PATCH] Fix #296

---
 app/widgets/Login/Login.php   | 2 --
 app/widgets/Login/locales.ini | 1 -
 2 files changed, 3 deletions(-)

diff --git a/app/widgets/Login/Login.php b/app/widgets/Login/Login.php
index 5b280408b..047952477 100644
--- a/app/widgets/Login/Login.php
+++ b/app/widgets/Login/Login.php
@@ -183,10 +183,8 @@ class Login extends \Movim\Widget\Base
         $here = $sd->getHash(sha1($username.$password.$host));
 
         if($here) {
-        //if($s->get('hash') == sha1($username.$password.$host)) {
             RPC::call('Login.setCookie', $here->session);
             RPC::call('MovimUtils.redirect', $this->route('main'));
-            $this->showErrorBlock('conflict');
             return;
         }
 
diff --git a/app/widgets/Login/locales.ini b/app/widgets/Login/locales.ini
index 5d5d3ef14..05d555775 100644
--- a/app/widgets/Login/locales.ini
+++ b/app/widgets/Login/locales.ini
@@ -16,7 +16,6 @@ default           = Unknown error
 login_format      = Invalid username format
 password_format   = Invalid password format
 unauthorized      = Your XMPP server is unauthorized
-conflict          = A Movim session is already open on an other device
 wrong_account     = Movim failed to authenticate. You entered wrong data
 mechanism         = Authentication mechanism not supported by Movim
 fail_auth         = The XMPP authentification failed