From 129af904f635e09fc992f81aa70e01263663f2eb Mon Sep 17 00:00:00 2001
From: Andrew Darqui <andrew.darqui@gmail.com>
Date: Sat, 5 Oct 2013 22:06:44 -0400
Subject: [PATCH] fixed an issue with Logger.io_close, needed to check for
 undefined on the socket.oEmit and socket. functions

---
 public/templates/admin/logger.tpl | 9 +++------
 src/logger.js                     | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/public/templates/admin/logger.tpl b/public/templates/admin/logger.tpl
index 83f569010b..7366760b83 100644
--- a/public/templates/admin/logger.tpl
+++ b/public/templates/admin/logger.tpl
@@ -40,10 +40,7 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	var	loadDelay = setInterval(function() {
-		if (nodebb_admin) {
-			nodebb_admin.prepare();
-			clearInterval(loadDelay);
-		}
-	}, 500);
+	require(['forum/admin/settings'], function(Settings) {
+		Settings.prepare();
+	});
 </script>
diff --git a/src/logger.js b/src/logger.js
index 06133ae1ca..ab84f3dad6 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -139,10 +139,10 @@ var opts = {
 		for(var v in clients) {
 			var client = clients[v];
 
-			if(client.oEmit != client.emit)
+			if(client.oEmit != undefined && client.oEmit != client.emit)
 				client.emit = client.oEmit;
 
-			if(client.$oEmit != client.$emit)
+			if(client.$oEmit != undefined && client.$oEmit != client.$emit)
 				client.$emit = client.$oEmit;
 		}
 	}