possibly fixed findUserId error

Zirak · Zirak · commit 74c974c23d23 · 2014-06-26T19:56:03.000+03:00
diff --git a/master.js b/master.js
@@ -2902,7 +2902,7 @@ return function ( id, cb ) {
 
 function loadUsers () {
 	if ( window.users ) {
-		bot.users = window.users;
+		bot.users = Object.merge( bot.users, window.users );
 	}
 }
 
diff --git a/master.min.js b/master.min.js
diff --git a/source/users.js b/source/users.js
@@ -108,7 +108,7 @@ return function ( id, cb ) {
 
 function loadUsers () {
 	if ( window.users ) {
-		bot.users = window.users;
+		bot.users = Object.merge( bot.users, window.users );
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2902,7 +2902,7 @@ return function ( id, cb ) {`
`2902`	`2902`
`2903`	`2903`	`function loadUsers () {`
`2904`	`2904`	`if ( window.users ) {`
`2905`		`- bot.users = window.users;`
	`2905`	`+ bot.users = Object.merge( bot.users, window.users );`
`2906`	`2906`	`}`
`2907`	`2907`	`}`
`2908`	`2908`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ return function ( id, cb ) {`
`108`	`108`
`109`	`109`	`function loadUsers () {`
`110`	`110`	`if ( window.users ) {`
`111`		`- bot.users = window.users;`
	`111`	`+ bot.users = Object.merge( bot.users, window.users );`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`