pencilblue#962 - Fixes more places that incorrectly reference cache t…

…imeouts
matt- · Mar 15, 2016 · f857e5d · f857e5d
1 parent 4bc025b
commit f857e5d
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 75 deletions.
diff --git a/include/service/entities/plugin_setting_service.js b/include/service/entities/plugin_setting_service.js
@@ -556,8 +556,8 @@ module.exports = function PluginSettingServiceModule(pb) {
     	if(!self.adminPluginSettingsService) {
             var opts = {
                 objType: 'plugin_settings',
-                useMemory: self.caching.useMemory,
-                useCache: self.caching.useCache,
+                useMemory: self.caching.use_memory,
+                useCache: self.caching.use_cache,
                 serviceName: 'PluginSettingService',
                 site: self.site,
                 onlyThisSite: true
@@ -578,8 +578,8 @@ module.exports = function PluginSettingServiceModule(pb) {
     	if(!self.adminThemeSettingsService) {
             var opts = {
                 objType: 'theme_settings',
-                useMemory: self.caching.useMemory,
-                useCache: self.caching.useCache,
+                useMemory: self.caching.use_memory,
+                useCache: self.caching.use_cache,
                 serviceName: 'ThemeSettingService',
                 site: self.site,
                 onlyThisSite: true

diff --git a/package.json b/package.json
@@ -1,74 +1,73 @@
 {
-  "author": {
-    "name": "PencilBlue, LLC",
-    "email": "[email protected]"
-  },
-  "contributors": [
-    {
-      "name": "Blake Callens"
+    "author": {
+        "name": "PencilBlue, LLC",
+        "email": "[email protected]"
     },
-    {
-      "name": "Brian Hyder"
-    }
-  ],
-  "name": "pencilblue",
-  "description": "A full featured Node.js CMS and blogging platform (plugins, server cluster management, data-driven pages)",
-  "keywords": [
-    "cms",
-    "website",
-    "platform"
-  ],
-  "version": "0.5.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/pencilblue/pencilblue.git"
-  },
-  "dependencies": {
-    "async": "0.9.0",
-    "async-eventemitter": "0.2.2",
-    "cookies": "0.5.0",
-    "fakeredis": "0.3.0",
-    "formidable": "1.0.17",
-    "htmlencode": "0.0.4",
-    "http-status-codes": "^1.0.5",
-    "locale": "0.0.20",
-    "lodash": "^3.8.0",
-    "mongodb": "2.0.42",
-    "node-uuid": "1.4.3",
-    "node.extend": "1.1.3",
-    "nodemailer": "0.5.3",
-    "npm": "2.13.3",
-    "process": "0.10.1",
-    "redis": "0.12.1",
-    "sanitize-html": "1.1.7",
-    "semver": "4.3.3",
-    "winston": "0.9.0"
-  },
-  "devDependencies": {
-    "coveralls": "2.11.2",
-    "istanbul": "0.3.6",
-    "mocha": "2.1.0",
-    "mocha-lcov-reporter": "0.0.1",
-    "should": "5.0.1"
-  },
-  "main": "./pencilblue.js",
-  "engines": {
-    "node": ">= 0.11.0 <5"
-  },
-  "scripts": {
-    "start": "node pencilblue.js",
-    "test": "istanbul cover ./node_modules/mocha/bin/_mocha -- -R spec --recursive"
-  },
-  "licenses": [
-    {
-      "type": "GNU GENERAL PUBLIC LICENSE Version 3",
-      "url": "http://www.gnu.org/licenses/gpl-3.0.html"
-    }
-  ],
-  "readme": "See README file",
-  "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/pencilblue/pencilblue/issues"
-  },
-  "_id": "[email protected]"
+    "contributors": [
+        {
+            "name": "Blake Callens"
+        },
+        {
+            "name": "Brian Hyder"
+        }
+    ],
+    "name": "pencilblue",
+    "description": "A full featured Node.js CMS and blogging platform (plugins, server cluster management, data-driven pages)",
+    "keywords": [
+        "cms",
+        "website",
+        "platform"
+    ],
+    "version": "0.5.1",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/pencilblue/pencilblue.git"
+    },
+    "dependencies": {
+        "async": "0.9.0",
+        "async-eventemitter": "0.2.2",
+        "cookies": "0.5.0",
+        "fakeredis": "0.3.0",
+        "formidable": "1.0.17",
+        "htmlencode": "0.0.4",
+        "http-status-codes": "^1.0.5",
+        "locale": "0.0.20",
+        "lodash": "^3.8.0",
+        "mongodb": "2.0.42",
+        "node-uuid": "1.4.3",
+        "node.extend": "1.1.3",
+        "nodemailer": "0.5.3",
+        "npm": "2.13.3",
+        "redis": "0.12.1",
+        "sanitize-html": "1.1.7",
+        "semver": "4.3.3",
+        "winston": "0.9.0"
+    },
+    "devDependencies": {
+        "coveralls": "2.11.2",
+        "istanbul": "0.3.6",
+        "mocha": "2.1.0",
+        "mocha-lcov-reporter": "0.0.1",
+        "should": "5.0.1"
+    },
+    "main": "./pencilblue.js",
+    "engines": {
+        "node": ">= 0.11.0 <5"
+    },
+    "scripts": {
+        "start": "node pencilblue.js",
+        "test": "istanbul cover ./node_modules/mocha/bin/_mocha -- -R spec --recursive"
+    },
+    "licenses": [
+        {
+            "type": "GNU GENERAL PUBLIC LICENSE Version 3",
+            "url": "http://www.gnu.org/licenses/gpl-3.0.html"
+        }
+    ],
+    "readme": "See README file",
+    "readmeFilename": "README.md",
+    "bugs": {
+        "url": "https://github.com/pencilblue/pencilblue/issues"
+    },
+    "_id": "[email protected]"
 }