Merge branch 'master' of odie.guru.si:codeq-web

Conflicts:
	index.html

1 files changed, 2 insertions, 2 deletions

diff --git a/js/codeq/login.js b/js/codeq/login.js
index e5a446b..7844dc4 100644
--- a/js/codeq/login.js
+++ b/js/codeq/login.js
@@ -16,9 +16,9 @@
                 if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message);
 
                 //merge these settings into the already existing default settings
-                sett = data.settings;
+                var sett = data.settings;
                 $.merge(true, codeq.settings, sett);
-                if('lang' in sett && sett['lan'] in codeq.supportedLangs){
+                if('lan' in sett && sett['lan'] in codeq.supportedLangs){
                     codeq.setLang(sett['lan']);
                 }