#1197 Completed conversion now cleaning up. still doesn't start

pencilblue · Feb 3, 2017 · 3338d99 · 3338d99
1 parent eb7a425
commit 3338d99
Show file tree

Hide file tree

Showing 5 changed files with 916 additions and 921 deletions.
diff --git a/include/http/parsers/index.js b/include/http/parsers/index.js
@@ -16,10 +16,9 @@
  */
 
 //dependencies
-var _ = require('lodash');
-var Configuration = require('../../config');
-var formidable = require('formidable');
-var util       = require('../../util.js');
+const _ = require('lodash');
+const Configuration = require('../../config');
+const formidable = require('formidable');
 
 /**
  * Provides function to construct the structure needed to display the navigation

diff --git a/include/requirements.js b/include/requirements.js
@@ -165,7 +165,7 @@ module.exports = function PB() {
     pb.TokenService       = require(path.join(config.docRoot, '/include/service/entities/token_service.js'));
 
     //create plugin service
-    pb.PluginService = require(path.join(config.docRoot, '/include/service/entities/plugin_service.js'))(pb);
+    pb.PluginService = require(path.join(config.docRoot, '/include/service/entities/plugin_service.js'));
     Object.defineProperty(pb, 'plugins', {
         get: function() {
             pb.log.warn('PencilBlue: pb.plugins is deprecated.  Use new pb.PluginService instead');