From 1d6135150f5b2c1ffe87ce8bc9e798bdb61a070a Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Mon, 4 Nov 2013 23:59:33 -0500
Subject: [PATCH] multiple plugins pointing to admin can conflict - fix

---
 src/routes/admin.js | 13 ++++++++-----
 src/webserver.js    | 20 +++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/routes/admin.js b/src/routes/admin.js
index afdb47adbc..8ab628e291 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -141,13 +141,16 @@ var user = require('./../user.js'),
 
 				for (var route in routes) {
 					if (routes.hasOwnProperty(route)) {
-						app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
-							routes[route].options(req, res, function(options) {
-								Admin.build_header(res, function (err, header) {
-									res.send(header + options.content + templates['admin/footer']);
+						(function(route) {
+							console.log(routes[route]);
+							app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
+								routes[route].options(req, res, function(options) {
+									Admin.build_header(res, function (err, header) {
+										res.send(header + options.content + templates['admin/footer']);
+									});
 								});
 							});
-						});
+						}(route));
 					}
 				}
 			});
diff --git a/src/webserver.js b/src/webserver.js
index bf847d960f..eebbf5708c 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -706,16 +706,18 @@ var express = require('express'),
 				var routes = custom_routes.routes;
 				for (var route in routes) {
 					if (routes.hasOwnProperty(route)) {
-						app[routes[route].method || 'get'](routes[route].route, function(req, res) {
-							routes[route].options(req, res, function(options) {
-								app.build_header({
-									req: options.req,
-									res: options.res
-								}, function (err, header) {
-									res.send(header + options.content + templates['footer']);
+						(function(route) {
+							app[routes[route].method || 'get'](routes[route].route, function(req, res) {
+								routes[route].options(req, res, function(options) {
+									app.build_header({
+										req: options.req,
+										res: options.res
+									}, function (err, header) {
+										res.send(header + options.content + templates['footer']);
+									});
 								});
 							});
-						});
+						}(route));
 					}
 				}
 			});
@@ -726,4 +728,4 @@ var express = require('express'),
 }(WebServer));
 
 
-global.server = server;
+global.server = server;
\ No newline at end of file